Correct a number of uses of del and return which had superfluous
parentheses. These are statement keywords, not function names, so
don't require parentheses around their expressions.
actor.universe.contents[actor.get("location")].portals()):
if portal.startswith(parameters):
actor.move_direction(portal)
actor.universe.contents[actor.get("location")].portals()):
if portal.startswith(parameters):
actor.move_direction(portal)
actor.send("You cannot go that way.")
return True
actor.send("You cannot go that way.")
return True
def is_restricted(self):
"""Boolean check whether command is administrative or debugging."""
def is_restricted(self):
"""Boolean check whether command is administrative or debugging."""
- return(
- self.get("administrative", False) or self.get("debugging", False))
+ return self.get(
+ "administrative", False) or self.get("debugging", False)
def is_admin(self):
"""Boolean check whether an actor is controlled by an admin owner."""
def is_admin(self):
"""Boolean check whether an actor is controlled by an admin owner."""
- return(self.owner and self.owner.is_admin())
+ return self.owner and self.owner.is_admin()
def can_run(self, command):
"""Check if the user can run this command object."""
# has to be in the commands group
if command not in self.universe.groups["command"].values():
def can_run(self, command):
"""Check if the user can run this command object."""
# has to be in the commands group
if command not in self.universe.groups["command"].values():
# debugging commands are not allowed outside debug mode
if command.get("debugging") and not self.universe.debug_mode():
# debugging commands are not allowed outside debug mode
if command.get("debugging") and not self.universe.debug_mode():
# avatars of administrators can run any command
if self.is_admin():
# avatars of administrators can run any command
if self.is_admin():
# everyone can run non-administrative commands
if not command.is_restricted():
# everyone can run non-administrative commands
if not command.is_restricted():
# otherwise the command cannot be run by this actor
# otherwise the command cannot be run by this actor
def update_location(self):
"""Make sure the location's contents contain this element."""
def update_location(self):
"""Make sure the location's contents contain this element."""
self.remove()
# get rid of the old user object
self.remove()
# get rid of the old user object
# create a new user object
new_user = User()
# create a new user object
new_user = User()
# take this one out of the list and delete
self.remove()
# take this one out of the list and delete
self.remove()
return_value = True
break
return_value = True
break
def is_admin(self):
"""Boolean check whether user's account is an admin."""
def is_admin(self):
"""Boolean check whether user's account is an admin."""
- return(self.account.get("administrator", False))
+ return self.account.get("administrator", False)
def broadcast(message, add_prompt=True):
def broadcast(message, add_prompt=True):
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
time.sleep(1)
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
time.sleep(1)
def stop_service(service):
def stop_service(service):
# The no-op case when no service was started
if service is None:
# The no-op case when no service was started
if service is None:
# This handles when the service is running as a direct child process
service.terminate()
# This handles when the service is running as a direct child process
service.terminate()
with open("capture_stderr.log", "w") as serviceerr:
serviceerr.write(stderr.decode("utf-8"))
with open("capture_stderr.log", "w") as serviceerr:
serviceerr.write(stderr.decode("utf-8"))
def tlog(message, quiet=False):
def tlog(message, quiet=False):