Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a typo on the @ic command's search_object call.

Browse source
This commit is contained in:
Griatch 2013-05-14 21:47:25 +02:00
parent e15d6dfb6e
commit 51cf5461fa
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/commands/default/player.py
View file

@ -222,7 +222,7 @@ class CmdIC(MuxPlayerCommand):
return return
if not new_character: if not new_character:
# search for a matching character # search for a matching character
new_character = search.object_search(self.args, player) new_character = search.object_search(self.args)
if new_character: if new_character:
new_character = new_character[0] new_character = new_character[0]
else: else:
@ -648,6 +648,6 @@ class CmdQuell(MuxPlayerCommand):
self.msg("Already quelling Player%s permissions." % permstr) self.msg("Already quelling Player%s permissions." % permstr)
return return
player.set_attribute('_quell', True) player.set_attribute('_quell', True)
self.msg("Quelling Player%s permissions. Use @unquell to get them back." % permstr) self.msg("Quelling Player permissions%s. Use @unquell to get them back." % permstr)
self._recache_locks(player) self._recache_locks(player)

2
src/commands/default/tests.py
View file

@ -164,7 +164,7 @@ class TestPlayer(CommandTest):
self.call(player.CmdSessions(), "", "Your current session(s):") self.call(player.CmdSessions(), "", "Your current session(s):")
self.call(player.CmdColorTest(), "ansi", "ANSI colors:") self.call(player.CmdColorTest(), "ansi", "ANSI colors:")
self.call(player.CmdCharCreate(), "Test1=Test char","Created new character Test1. Use @ic Test1 to enter the game") self.call(player.CmdCharCreate(), "Test1=Test char","Created new character Test1. Use @ic Test1 to enter the game")
self.call(player.CmdQuell(), "", "Quelling Player permissions (Immortals).") self.call(player.CmdQuell(), "", "Quelling Player permissions (Immortals). Use @unquell to get them back.")
from src.commands.default import building from src.commands.default import building
class TestBuilding(CommandTest): class TestBuilding(CommandTest):

1
src/objects/manager.py
View file

@ -167,6 +167,7 @@ class ObjectManager(TypedObjectManager):
""" """
if isinstance(property_value, basestring): if isinstance(property_value, basestring):
property_value = to_unicode(property_value) property_value = to_unicode(property_value)
if isinstance(property_name, basestring):
property_name = "db_%s" % property_name.lstrip('db_') property_name = "db_%s" % property_name.lstrip('db_')
cand_restriction = candidates and Q(pk__in=[_GA(obj, "id") for obj in make_iter(candidates) if obj]) or Q() cand_restriction = candidates and Q(pk__in=[_GA(obj, "id") for obj in make_iter(candidates) if obj]) or Q()
type_restriction = typeclasses and Q(db_typeclass_path__in=make_iter(typeclasses)) or Q() type_restriction = typeclasses and Q(db_typeclass_path__in=make_iter(typeclasses)) or Q()