Merge pull request #159 from natemontgomery/master

Fix master, thanks ElsIf!

Author: kamilion

.gitignore

@@ -1,4 +1,3 @@
-.cache
 *.py[cod]
 
 # C extensions
@@ -52,5 +51,4 @@ nosetests.xml
 # Mac cleanup
 .DS_Store
 
-cover
-.noseids
+cover

README.md

@@ -2,8 +2,6 @@
 
 StarryPy is Twisted-based plugin-driven Starbound server wrapper. It is currently in beta.
 
-# The build is currently broken while we are applying a PEP8 pull request.
-
 ## Features
 
 With the built-in plugins (which are removable):

base_plugin.py

@@ -12,7 +12,7 @@ class MapOverridePacketsMethods(type):
 
     def __new__(cls, name, bases, cls_dict):
         if name != 'BasePlugin':
-            cls_dict['overridden_methods'] = {}
+            cls_dict['overridden_packets'] = {}
             methods = (
                 key for key, value in cls_dict.iteritems()
                 if key not in cls.ignored_methods and callable(value)
@@ -23,7 +23,7 @@ def __new__(cls, name, bases, cls_dict):
                     packet_name = packet.group('packet_name').upper()
                     enum = getattr(Packets, packet_name, None)
                     if enum:
-                        cls_dict['overridden_methods'].setdefault(
+                        cls_dict['overridden_packets'].setdefault(
                             enum.value, {}
                         )[packet.group('when')] = packet_method_name
 
@@ -59,13 +59,11 @@ class BasePlugin(object):
     active = False
 
     def __init__(self, *args, **kwargs):
-        self.overridden_methods = {}
         super(BasePlugin, self).__init__(*args, **kwargs)
         if self.__class__.__name__ != 'BasePlugin':
-            for packet, when_dict in self.overridden_methods.iteritems():
-                self.overridden_methods.setdefault(packet, {})
+            for packet, when_dict in self.overridden_packets.iteritems():
                 for when, packet_name in when_dict.iteritems():
-                    self.overridden_methods[packet][when] = getattr(
+                    self.overridden_packets[packet][when] = getattr(
                         self, packet_name
                     )
 

plugin_manager.py

@@ -275,7 +275,7 @@ def map_plugin_packets(self, plugin):
         """
         Maps plugin overridden packets ready to use in do method.
         """
-        for packet_id, when_dict in plugin.overridden_methods.iteritems():
+        for packet_id, when_dict in plugin.overridden_packets.iteritems():
             for when, packet_method in when_dict.iteritems():
                 self.packets.setdefault(
                     packet_id, {}

plugins/admin_messenger/admin_messenger.py

@@ -9,7 +9,7 @@ class AdminMessenger(BasePlugin):
     """
     Adds support to message moderators/admins/owner with a @@ prefixed message.
     """
-    name = 'admin_messenger'
+    name = "admin_messenger"
     depends = ['player_manager_plugin']
 
     def activate(self):
@@ -26,56 +26,48 @@ def on_chat_sent(self, data):
             return False
         return True
 
-    def add_timestamp(self, add_normalizer=False):
+    def message_admins(self, message):
+        now = datetime.now()
         if self.config.chattimestamps:
-            now = datetime.now()
-            timestamp = '^red;<{}> '.format(now.strftime('%H:%M'))
-            if add_normalizer:
-                return '{}^yellow;'.format(timestamp)
-            return timestamp
+            timestamp = "^red;<{}> ^yellow;".format(now.strftime("%H:%M"))
         else:
-            return ''
-
-    def message_admins(self, message):
-        timestamp = self.add_timestamp(add_normalizer=True)
-        message = message.message[2:].decode('utf-8')
-
+            timestamp = ""
         for protocol in self.factory.protocols.itervalues():
             if protocol.player.access_level >= UserLevels.MODERATOR:
                 protocol.send_chat_message(
-                    '{timestamp}{moderator_colors}'
-                    'ADMIN: ^yellow;<{player_colors}^yellow;> '
-                    '{moderator_colors}{message}'.format(
-                        timestamp=timestamp,
-                        moderator_colors=self.config.colors['moderator'],
-                        player_colors=(
-                            self.protocol.player.colored_name(
-                                self.config.colors
-                            )
-                        ),
-                        message=message
+                    "{}{}ADMIN: ^yellow;<{}^yellow;> {}{}".format(
+                        timestamp,
+                        self.config.colors["moderator"],
+                        self.protocol.player.colored_name(self.config.colors),
+                        self.config.colors["moderator"],
+                        message.message[2:].decode("utf-8")
                     )
                 )
                 self.logger.info(
-                    'Received an admin message from %s. Message: %s',
-                    self.protocol.player.name, message
+                    "Received an admin message from %s. Message: %s",
+                    self.protocol.player.name,
+                    message.message[2:].decode("utf-8")
                 )
 
     @permissions(UserLevels.ADMIN)
     def broadcast_message(self, message):
-        timestamp = self.add_timestamp()
+        now = datetime.now()
+        if self.config.chattimestamps:
+            timestamp = "^red;<{}> ".format(now.strftime("%H:%M"))
+        else:
+            timestamp = ""
 
         for protocol in self.factory.protocols.itervalues():
             protocol.send_chat_message(
-                '{}{}BROADCAST: ^red;{}{}'.format(
+                "{}{}BROADCAST: ^red;{}{}".format(
                     timestamp,
-                    self.config.colors['admin'],
-                    message.message[3:].decode('utf-8').upper(),
-                    self.config.colors['default']
+                    self.config.colors["admin"],
+                    message.message[3:].decode("utf-8").upper(),
+                    self.config.colors["default"]
                 )
             )
             self.logger.info(
-                'Broadcast from %s. Message: %s',
+                "Broadcast from %s. Message: %s",
                 self.protocol.player.name,
-                message.message[3:].decode('utf-8').upper()
+                message.message[3:].decode("utf-8").upper()
             )

plugins/admin_messenger/test_admin_messenger.py

@@ -2,11 +2,14 @@
 
 
 class Announcer(BasePlugin):
-    """
+    '''
     Broadcasts a message whenever a player joins or leaves the server.
-    """
+    '''
     name = 'announcer_plugin'
 
+    def activate(self):
+        super(Announcer, self).activate()
+
     def after_connect_success(self, data):
         self.factory.broadcast(
             '{} logged in.'.format(