From 3878bed244ee3637eb0f3fc5e08840ef3b876dea Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 7 Oct 2020 15:51:01 +0000 Subject: [PATCH] The del and return statements aren't functions 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. --- mudpy/command.py | 2 +- mudpy/misc.py | 22 +++++++++++----------- mudpy/tests/selftest.py | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mudpy/command.py b/mudpy/command.py index 5ee7ce8..d186053 100644 --- a/mudpy/command.py +++ b/mudpy/command.py @@ -305,7 +305,7 @@ def move(actor, parameters): actor.universe.contents[actor.get("location")].portals()): if portal.startswith(parameters): actor.move_direction(portal) - return(portal) + return portal actor.send("You cannot go that way.") return True diff --git a/mudpy/misc.py b/mudpy/misc.py index e9845d5..7051ac9 100644 --- a/mudpy/misc.py +++ b/mudpy/misc.py @@ -186,34 +186,34 @@ class Element: 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.""" - 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(): - return(False) + return False # debugging commands are not allowed outside debug mode if command.get("debugging") and not self.universe.debug_mode(): - return(False) + return False # avatars of administrators can run any command if self.is_admin(): - return(True) + return True # everyone can run non-administrative commands if not command.is_restricted(): - return(True) + return True # otherwise the command cannot be run by this actor - return(False) + return False def update_location(self): """Make sure the location's contents contain this element.""" @@ -578,7 +578,7 @@ class User: self.remove() # get rid of the old user object - del(self) + del self # create a new user object new_user = User() @@ -642,7 +642,7 @@ class User: # take this one out of the list and delete self.remove() - del(self) + del self return_value = True break @@ -1014,7 +1014,7 @@ class User: 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): diff --git a/mudpy/tests/selftest.py b/mudpy/tests/selftest.py index c6f3398..ede3cb2 100644 --- a/mudpy/tests/selftest.py +++ b/mudpy/tests/selftest.py @@ -488,7 +488,7 @@ def start_service(config): stdout=subprocess.PIPE, stderr=subprocess.PIPE) time.sleep(1) - return(service) + return service def stop_service(service): @@ -496,7 +496,7 @@ def stop_service(service): # The no-op case when no service was started if service is None: - return(success) + return success # This handles when the service is running as a direct child process service.terminate() @@ -530,7 +530,7 @@ def stop_service(service): with open("capture_stderr.log", "w") as serviceerr: serviceerr.write(stderr.decode("utf-8")) - return(success) + return success def tlog(message, quiet=False): -- 2.11.0