Added at_init() call in idmapper and made sure to not deprecate it. Fixed bugs in search and continued work on tutorial world.
This commit is contained in:
parent
621a2f73e9
commit
7f0e0d5ef8
8 changed files with 63 additions and 29 deletions
|
|
@ -357,7 +357,7 @@ class CmdSetHandler(object):
|
|||
cmdset.permanent = False
|
||||
self.update()
|
||||
|
||||
def delete(self, cmdset=None):
|
||||
def remove(self, cmdset=None):
|
||||
"""
|
||||
Remove a cmdset from the handler.
|
||||
|
||||
|
|
@ -409,8 +409,10 @@ class CmdSetHandler(object):
|
|||
pass
|
||||
# re-sync the cmdsethandler.
|
||||
self.update()
|
||||
# legacy alias
|
||||
delete = remove
|
||||
|
||||
def delete_default(self):
|
||||
def remove_default(self):
|
||||
"""
|
||||
This explicitly deletes the default cmdset. It's the
|
||||
only command that can.
|
||||
|
|
@ -428,6 +430,8 @@ class CmdSetHandler(object):
|
|||
else:
|
||||
self.cmdset_stack = [_EmptyCmdSet(cmdsetobj=self.obj)]
|
||||
self.update()
|
||||
# legacy alias
|
||||
delete_default = remove_default
|
||||
|
||||
def all(self):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -1714,9 +1714,12 @@ class CmdExamine(ObjManipCommand):
|
|||
"""
|
||||
Formats a single attribute line.
|
||||
"""
|
||||
if crop and isinstance(value, basestring):
|
||||
if crop:
|
||||
if not isinstance(value, basestring):
|
||||
value = utils.to_str(value, force_string=True)
|
||||
value = utils.crop(value)
|
||||
value = utils.to_unicode(value)
|
||||
|
||||
string = "\n %s = %s" % (attr, value)
|
||||
string = raw(string)
|
||||
return string
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue