diff --git a/src/ircdb.py b/src/ircdb.py index 03711051d..8ac18e37b 100644 --- a/src/ircdb.py +++ b/src/ircdb.py @@ -45,7 +45,6 @@ import utils import world import ircutils import unpreserve -from structures import PersistentDictionary def fromChannelCapability(capability): """Returns a (channel, capability) tuple from a channel capability.""" @@ -403,7 +402,7 @@ class IrcChannel(object): class Creator(object): - def command(self, command, rest, lineno): + def badCommand(self, command, rest, lineno): raise ValueError, 'Invalid command on line %s: %s' % (lineno, command) class IrcUserCreator(Creator): diff --git a/src/unpreserve.py b/src/unpreserve.py index fcf347ceb..6c0f53186 100644 --- a/src/unpreserve.py +++ b/src/unpreserve.py @@ -68,7 +68,7 @@ class Reader(object): command = getattr(self.creator, command) command(rest, lineno) else: - self.creator.command(command, rest, lineno) + self.creator.badCommand(command, rest, lineno) if self.modifiedCreator: self.creator.finish()