Make server.py pep8 compliant

1 files changed, 50 insertions, 45 deletions

diff --git a/server.py b/server.py
index 1ecf779..187aec7 100644
--- a/server.py
+++ b/server.py
@@ -1,74 +1,79 @@
-from sleekxmpp.componentxmpp import ComponentXMPP
+import logging
+import ConfigParser
 from argparse import ArgumentParser
-from user import UserHandler
+
+from sleekxmpp.componentxmpp import ComponentXMPP
 from sleekxmpp.xmlstream.xmlstream import XMLStream
-import logging
+
+from user import UserHandler
 
 class ObjectComponent(ComponentXMPP):
 
     def __init__(self, jid, secret, server, port, root):
         ComponentXMPP.__init__(self, jid, secret, server, port)
-        self.register_plugin("AliasPlugin", module = "plugin" )
+        self.register_plugin("AliasPlugin", module = "plugin")
         self.add_event_handler("session_start", self.start)
-        self.add_event_handler("presence_probe", self.presenceProbe)
+        self.add_event_handler("presence_probe", self.presence_probe)
         self.add_event_handler("message", self.message)
-        self.add_event_handler("changed_subscription", self.presenceSubscription)
+        self.add_event_handler("changed_subscription", self.presence_subscription)
         self.userHandler = UserHandler(root)
 
     def start(self, event):
-        for user in self.userHandler.getUserList() :
+        for user in self.userHandler.getUserList():
             self.sendPresence(pto = user)
-            
-    def disconnect(self, reconnect=False):
-        for user in self.userHandler.getUserList() :
+
+    def disconnect(self, reconnect = False):
+        for user in self.userHandler.getUserList():
             self.sendPresence(pto = user, ptype = "unavailable")
         XMLStream.disconnect(self, reconnect)
-        logging.info('Component %s disconnected' % self.boundjid.bare)
-    
+        logging.info('Component {} disconnected'.format(self.boundjid.bare))
+
     def message(self, msg):
-        msg.reply("Thanks for sending\n%(body)s" % msg).send()
-        
-    def presenceSubscription(self, subscription) :
-        if subscription["type"] == "subscribe" :
+        msg.reply("Thanks for sending\n{[body]}".format(msg)).send()
+
+    def presence_subscription(self, subscription):
+        if subscription["type"] == "subscribe":
             userJID = subscription["from"].full
             self.userHandler.register(userJID)
             subscription.reply().send()
             self.sendPresence(pto = userJID)
-            self.sendPresenceSubscription(pto=userJID, ptype="subscribe")
-        if subscription["type"] == "unsubscribe" :
+            self.sendPresenceSubscription(pto = userJID, ptype = "subscribe")
+        if subscription["type"] == "unsubscribe":
             userJID = subscription["from"].full
             self.userHandler.unregister(userJID)
-        
-    def presenceProbe(self, event):
+
+    def presence_probe(self, event):
         self.sendPresence(pto = event["from"].full)
 
-        
-if __name__ == '__main__' :
-    commandline = ArgumentParser(description='Connect the alias component to a given server')
-    commandline.add_argument('-p', '--port', 
-                             help='Port to connect to', 
-                             type=int)
-    commandline.add_argument('-s', '--secret', 
-                         help='password')
-    commandline.add_argument('-n', '--name', 
-                     help='Name the component will have')
-    commandline.add_argument('-r', '--root', 
-                     help='Root directory of the user files')
-    commandline.add_argument('-d', '--debug', 
-                     help='Set log level to DEBUG',
-                     action='store_const',
-                     const=logging.DEBUG,
-                     default=logging.INFO)
-    commandline.add_argument('host', 
-                         help='Host to connect to')
+
+if __name__ == '__main__':
+    commandline = ArgumentParser(description = 'Connect the alias \
+                                component to a given server')
+    commandline.add_argument('-p', '--port',
+                             help = 'Port to connect to',
+                             type = int)
+    commandline.add_argument('-s', '--secret',
+                             help = 'password')
+    commandline.add_argument('-n', '--name',
+                             help = 'Name the component will have')
+    commandline.add_argument('-r', '--root',
+                             help = 'Root directory of the user files')
+    commandline.add_argument('-d', '--debug',
+                             help = 'Set log level to DEBUG',
+                             action = 'store_const',
+                             const = logging.DEBUG,
+                             default = logging.INFO)
+    commandline.add_argument('host',
+                             help = 'Host to connect to')
     args = commandline.parse_args()
-    logging.basicConfig(level=args.debug)
-    component = ObjectComponent(args.name, args.secret, args.host, args.port, args.root)
+    logging.basicConfig(level = args.debug)
+    component = ObjectComponent(args.name, args.secret,
+                                args.host, args.port, args.root)
 
-    if component.connect() :
-        logging.info('Component %s connected' % args.name )
+    if component.connect():
+        logging.info('Component {} connected'.format(args.name))
         component.process(False)
     else :
         print "Couldn't connect"
-        
-    
+
+