Merge branch 'Objects_Docstrings_Formatting' of https://github.com/tajmone/evennia into tajmone-Docstring_Typo

This commit is contained in:
Griatch 2015-04-17 11:30:48 +02:00
commit c713adfcb4

View file

@ -483,8 +483,8 @@ class DefaultObject(ObjectDB):
Args: Args:
destination (Object): Reference to the object to move to. This destination (Object): Reference to the object to move to. This
can also be an exit object, in which case the can also be an exit object, in which case the
destination property is used as destination. destination property is used as destination.
quiet (bool): If true, turn off the calling of the emit hooks quiet (bool): If true, turn off the calling of the emit hooks
(announce_move_to/from etc) (announce_move_to/from etc)
emit_to_obj (Object): object to receive error messages emit_to_obj (Object): object to receive error messages
@ -494,13 +494,14 @@ class DefaultObject(ObjectDB):
to_none (bool): Allow destination to be None. Note that no hooks are run when to_none (bool): Allow destination to be None. Note that no hooks are run when
moving to a None location. If you want to run hooks, run them manually moving to a None location. If you want to run hooks, run them manually
(and make sure they can manage None locations). (and make sure they can manage None locations).
move_hooks (bool): If False, turn off the calling of move-related hooks (at_before/after_move etc) move_hooks (bool): If False, turn off the calling of move-related hooks
with quiet=True, this is as quiet a move as can be done. (at_before/after_move etc) with quiet=True, this is as quiet a move
as can be done.
Returns: Returns:
result (bool): True/False depending on if there were problems with the move. result (bool): True/False depending on if there were problems with the move.
This method may also return various error messages to the This method may also return various error messages to the
emit_to_obj. `emit_to_obj`.
Notes: Notes:
No access checks are done in this method, these should be handled before No access checks are done in this method, these should be handled before