Massive reformatting to get closer to PEP-8

Author: AMorporkian

base_plugin.py

@@ -367,7 +367,6 @@ def activate(self):
                 self.plugins['command_dispatcher'].register(alias, command)
 
 
-
     def deactivate(self):
         super(SimpleCommandPlugin, self).deactivate()
         for command in self.commands:

config.py

@@ -32,6 +32,7 @@ def save(self):
         except Exception as e:
             self.logger.critical("Tried to save the configuration file, failed.\n%s", str(e))
             raise
+
     def __getattr__(self, item):
         if item != "config":
             if item in self.config:

core_plugins/player_manager/manager.py

@@ -11,6 +11,7 @@
     ForeignKey, Boolean, func
 from sqlalchemy.ext.declarative import declarative_base
 from twisted.words.ewords import AlreadyLoggedIn
+
 logger = logging.getLogger("starrypy.player_manager.manager")
 
 Base = declarative_base()
@@ -47,7 +48,6 @@ class Player(Base):
     planet = Column(String)
     on_ship = Column(Boolean)
 
-
     ips = relationship("IPAddress", order_by="IPAddress.id", backref="players")
 
     def colored_name(self, colors):

packet_stream.py

@@ -2,6 +2,7 @@
 import zlib
 import packets
 
+
 class Packet(object):
     def __init__(self, packet_id, payload_size, data, original_data, direction, compressed=False):
         self.id = packet_id
@@ -14,6 +15,7 @@ def __init__(self, packet_id, payload_size, data, original_data, direction, comp
 
 class PacketStream(object):
     logger = logging.getLogger('starrypy.packet_stream.PacketStream')
+
     def __init__(self, protocol):
         self._stream = ""
         self.id = None
@@ -45,7 +47,7 @@ def start_packet(self):
                     self.compressed = True
                 else:
                     self.compressed = False
-                self.header_length = 1+len(packets.SignedVLQ("").build(packet_header.payload_size))
+                self.header_length = 1 + len(packets.SignedVLQ("").build(packet_header.payload_size))
                 self.packet_size = self.payload_size + self.header_length
                 return True
         except:
@@ -59,13 +61,13 @@ def check_packet(self):
                 if not self._stream:
                     self._stream = ""
                 p_parsed = packets.packet().parse(p)
-                if self.compressed and len(p_parsed.data) > 1000:
+                if self.compressed:
                     try:
                         z = zlib.decompressobj()
                         p_parsed.data = z.decompress(p_parsed.data)
                     except zlib.error:
                         self.logger.warning("Decompression error in check_packet.")
-                        pass
+                        raise
                 packet = Packet(packet_id=p_parsed.id, payload_size=p_parsed.payload_size, data=p_parsed.data,
                                 original_data=p, direction=self.direction)
 

packets/data_types.py

@@ -6,6 +6,7 @@
 
 class SignedVLQ(Construct):
     logger = logging.getLogger('starrypy.packets.SignedVLQ')
+
     def _parse(self, stream, context):
         value = 0
         while True:
@@ -29,9 +30,9 @@ def _build(self, obj, stream, context):
             raise
 
 
-
 class VLQ(Construct):
     logger = logging.getLogger('starrypy.packets.SignedVLQ')
+
     def _parse(self, stream, context):
         value = 0
         while True:
@@ -81,6 +82,7 @@ def _decode(self, obj, context):
                                LazyBound("data",
                                          lambda: Variant(""))))
 
+
 class dict_variant(Construct):
     def _parse(self, stream, context):
         l = VLQ("").parse_stream(stream)
@@ -91,6 +93,7 @@ def _parse(self, stream, context):
             c[key] = value
         return c
 
+
 class Variant(Construct):
     def _parse(self, stream, context):
         x = Byte("").parse_stream(stream)

packets/packet_types.py

@@ -123,7 +123,7 @@ def _decode(self, obj, context):
                                                       Flag("uuid_exists"),
                                                       If(lambda ctx: ctx.uuid_exists is True,
                                                          HexAdapter(Field("uuid", 16))
-                                                         ),
+                                                      ),
                                                       star_string("name"),
                                                       star_string("species"),
                                                       VLQ("shipworld_length"),

plugin_manager.py

@@ -12,6 +12,7 @@
 from base_plugin import BasePlugin
 from config import ConfigurationManager
 
+
 class DuplicatePluginError(Exception):
     """
     Raised when there is a plugin of the same name/class already instantiated.
@@ -33,6 +34,7 @@ class MissingDependency(PluginNotFound):
 
 class PluginManager(object):
     logger = logging.getLogger('starrypy.plugin_manager.PluginManager')
+
     def __init__(self, base_class=BasePlugin):
         """
         Initializes the plugin manager. When called, with will first attempt
@@ -107,7 +109,6 @@ def reload_plugins(self):
             raise
 
 
-
     def activate_plugins(self):
         for plugin in self.plugins:
             if plugin.auto_activate:
@@ -139,7 +140,8 @@ def do(self, protocol, command, data):
                     res = True
                 return_values.append(res)
             except Exception as e:
-                self.logger.exception("Error in plugin %s with function %s.", str(plugin), command, exc_info=True)
+                self.logger.exception("Error in plugin %s with function %s.", str(plugin), command,
+                                      exc_info=True)
         return all(return_values)
 
     def get_by_name(self, name):

plugins/admin_commands_plugin/admin_command_plugin.py

@@ -44,7 +44,8 @@ def who(self, data):
 
     def planet(self, data):
         """Displays who is on your current planet."""
-        who = [w.colored_name(self.config.colors) for w in self.player_manager.who() if w.planet == self.protocol.player.planet and not w.on_ship]
+        who = [w.colored_name(self.config.colors) for w in self.player_manager.who() if
+               w.planet == self.protocol.player.planet and not w.on_ship]
         self.protocol.send_chat_message("Players on your current planet: %s" % " ".join(who))
 
     @permissions(UserLevels.ADMIN)
@@ -56,7 +57,7 @@ def whois(self, data):
             self.protocol.send_chat_message(
                 "Name: %s\nUserlevel: %s\nUUID: %s\nIP address: %s\nCurrent planet: %s""" % (
                     info.colored_name(self.config.colors), UserLevels(info.access_level), info.uuid, info.ip,
-                info.planet))
+                    info.planet))
         else:
             self.protocol.send_chat_message("Player not found!")
         return False
@@ -79,16 +80,17 @@ def promote(self, data):
                 elif rank == "guest":
                     self.make_guest(player)
                 else:
-                    self.protocol.send_chat_message("No such rank!\n"+self.promote.__doc__)
+                    self.protocol.send_chat_message("No such rank!\n" + self.promote.__doc__)
                     return
 
                 self.protocol.send_chat_message("%s: %s -> %s" % (
                     player.colored_name(self.config.colors), str(UserLevels(old_rank)).split(".")[1],
                     rank.upper()))
-                self.protocol.factory.protocols[player.protocol].send_chat_message("%s has promoted you to %s" % (
-                    player.colored_name(self.config.colors), rank.upper()))
+                self.protocol.factory.protocols[player.protocol].send_chat_message(
+                    "%s has promoted you to %s" % (
+                        player.colored_name(self.config.colors), rank.upper()))
             else:
-                self.protocol.send_chat_message("Player not found!\n"+self.promote.__doc__)
+                self.protocol.send_chat_message("Player not found!\n" + self.promote.__doc__)
                 return
         else:
             self.protocol.send_chat_message(self.promote.__doc__)
@@ -129,7 +131,8 @@ def kick(self, data):
                                             (self.protocol.player.name,
                                              info.name,
                                              " ".join(reason)))
-            self.logger.info("%s kicked %s (reason: %s", self.protocol.player.name, info.name, " ".join(reason))
+            self.logger.info("%s kicked %s (reason: %s", self.protocol.player.name, info.name,
+                             " ".join(reason))
         return False
 
     @permissions(UserLevels.ADMIN)
@@ -176,9 +179,10 @@ def give_item(self, data):
                 give_item_to_player(target_protocol, item_name, item_count)
                 target_protocol.send_chat_message(
                     "%s has given you: %s (count: %s)" % (
-                    self.protocol.player.name, item_name, item_count))
+                        self.protocol.player.name, item_name, item_count))
                 self.protocol.send_chat_message("Sent the item(s).")
-                self.logger.info("%s gave %s %s (count: %s)", self.protocol.player.name, name, item_name, item_count)
+                self.logger.info("%s gave %s %s (count: %s)", self.protocol.player.name, name, item_name,
+                                 item_count)
             else:
                 self.protocol.send_chat_message("You have to give an item name.")
         else:

plugins/admin_messenger.py

@@ -0,0 +1,26 @@
+from base_plugin import BasePlugin
+from core_plugins.player_manager import UserLevels
+import packets
+
+
+class AdminMessenger(BasePlugin):
+    """Adds support to message moderators/admins/owner with a ## prefixed message."""
+    name = "admin_messenger"
+    depends = ['player_manager']
+    auto_activate = True
+
+    def on_chat_sent(self, data):
+        data = packets.chat_sent().parse(data.data)
+        if data.message[:2] == "##":
+            self.message_admins(data)
+            return False
+        return True
+
+    def message_admins(self, message):
+        for protocol in self.protocol.factory.protocols.itervalues():
+            if protocol.player.access_level >= UserLevels.MODERATOR:
+                protocol.send_chat_message(
+                    "Received an admin message from %s: %s." % (self.protocol.player.name,
+                                                                message.message[2:]))
+                self.logger.info("Received an admin message from %s. Message: %s", self.protocol.player.name,
+                                 message.message[2:])

plugins/new_player_greeter_plugin/new_player_greeter_plugin.py

@@ -1,4 +1,3 @@
-
 from base_plugin import BasePlugin
 from utility_functions import give_item_to_player