diff --git a/contrib/menu_login.py b/contrib/menu_login.py index 28ba160fca..b698d4c9e2 100644 --- a/contrib/menu_login.py +++ b/contrib/menu_login.py @@ -31,7 +31,7 @@ the initial splash screen. import re import traceback from django.conf import settings -from ev import db_players, db_serverconfs, db_channels +from ev import db_players, db_serverconfigs, db_channels from ev import utils, logger, create_player from ev import Command, CmdSet from ev import syscmdkeys @@ -115,7 +115,7 @@ class CmdPasswordSelect(Command): return # before going on, check eventual bans - bans = db_serverconfs.conf("server_bans") + bans = db_serverconfigs.conf("server_bans") if bans and (any(tup[0]==player.name for tup in bans) or any(tup[2].match(player.sessions[0].address[0]) for tup in bans if tup[2])): diff --git a/ev.py b/ev.py index 8156c76f6c..ead5d01944 100644 --- a/ev.py +++ b/ev.py @@ -131,7 +131,7 @@ del ObjAttribute, Alias, ObjectNick, ObjectDB # server from src.server.models import ServerConfig -db_serverconfs = ServerConfig.objects +db_serverconfigs = ServerConfig.objects del ServerConfig # utils diff --git a/game/gamesrc/commands/examples/cmdset_red_button.py b/game/gamesrc/commands/examples/cmdset_red_button.py index d9883267d5..b22c003f51 100644 --- a/game/gamesrc/commands/examples/cmdset_red_button.py +++ b/game/gamesrc/commands/examples/cmdset_red_button.py @@ -8,8 +8,7 @@ cmdset - this way you can often re-use the commands too. """ import random -from ev import CmdSet -from ev import Command +from ev import Command, CmdSet # Some simple commands for the red button