X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=mudpy%2Fmisc.py;h=c0f73a1faf6af70d44b7b5620de8acda50811c28;hp=e9845d5c349678d4f789f31762c9211c03b4651f;hb=3b59b8a74388427be4e06d0dad558d597ee34ef4;hpb=4f7b0a6280ab17e1ccfd4aa603cdd647e92ac12b diff --git a/mudpy/misc.py b/mudpy/misc.py index e9845d5..c0f73a1 100644 --- a/mudpy/misc.py +++ b/mudpy/misc.py @@ -186,34 +186,33 @@ 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 bool(self.get("administrative") or self.get("debugging")) 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 +577,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 +641,7 @@ class User: # take this one out of the list and delete self.remove() - del(self) + del self return_value = True break @@ -1014,7 +1013,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):