PEP8/misc fixes

Fix indentation, spacing, imports order, variable names, etc.

Author: EvaSDK

fluent/event.py

@@ -1,6 +1,10 @@
-from fluent import sender
+# -*- coding: utf-8 -*-
+
 import time
 
+from fluent import sender
+
+
 class Event(object):
     def __init__(self, label, data, **kwargs):
         assert isinstance(data, dict), 'data must be a dict'

fluent/handler.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import logging
 import socket
 
@@ -8,22 +10,22 @@
 
 from fluent import sender
 
+
 class FluentRecordFormatter(object):
     def __init__(self):
         self.hostname = socket.gethostname()
 
     def format(self, record):
-        data = {
-          'sys_host' : self.hostname,
-          'sys_name' : record.name,
-          'sys_module' : record.module,
-          # 'sys_lineno' : record.lineno,
-          # 'sys_levelno' : record.levelno,
-          # 'sys_levelname' : record.levelname,
-          # 'sys_filename' : record.filename,
-          # 'sys_funcname' : record.funcName,
-          # 'sys_exc_info' : record.exc_info,
-        }
+        data = {'sys_host': self.hostname,
+                'sys_name': record.name,
+                'sys_module': record.module,
+                # 'sys_lineno': record.lineno,
+                # 'sys_levelno': record.levelno,
+                # 'sys_levelname': record.levelname,
+                # 'sys_filename': record.filename,
+                # 'sys_funcname': record.funcName,
+                # 'sys_exc_info': record.exc_info,
+                }
         # if 'sys_exc_info' in data and data['sys_exc_info']:
         #    data['sys_exc_info'] = self.formatException(data['sys_exc_info'])
 
@@ -45,16 +47,17 @@ def _add_dic(data, dic):
             if isinstance(key, basestring):
                 data[str(key)] = value
 
+
 class FluentHandler(logging.Handler):
     '''
     Logging Handler for fluent.
     '''
     def __init__(self,
-           tag,
-           host='localhost',
-           port=24224,
-           timeout=3.0,
-           verbose=False):
+                 tag,
+                 host='localhost',
+                 port=24224,
+                 timeout=3.0,
+                 verbose=False):
 
         self.tag = tag
         self.sender = sender.FluentSender(tag,

fluent/sender.py

@@ -1,21 +1,28 @@
+# -*- coding: utf-8 -*-
+
 from __future__ import print_function
-import msgpack
 import socket
 import threading
 import time
 
+import msgpack
+
+
 _global_sender = None
 
+
 def setup(tag, **kwargs):
     host = kwargs.get('host', 'localhost')
     port = kwargs.get('port', 24224)
 
     global _global_sender
     _global_sender = FluentSender(tag, host=host, port=port)
 
+
 def get_global_sender():
     return _global_sender
 
+
 class FluentSender(object):
     def __init__(self,
                  tag,
@@ -36,7 +43,7 @@ def __init__(self,
         self.pendings = None
         self.packer = msgpack.Packer()
         self.lock = threading.Lock()
-        
+
         try:
             self._reconnect()
         except Exception:

tests/__init__.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 from tests.test_event import *
 from tests.test_sender import *
 from tests.test_handler import *

tests/mockserver.py

@@ -1,13 +1,17 @@
-import socket
-import threading
-import time
-from msgpack import Unpacker
+# -*- coding: utf-8 -*-
 
 try:
     from cStringIO import StringIO as BytesIO
 except ImportError:
     from io import BytesIO
 
+import socket
+import threading
+import time
+
+from msgpack import Unpacker
+
+
 class MockRecvServer(threading.Thread):
     """
     Single threaded server accepts one connection and recv until EOF.
@@ -21,16 +25,16 @@ def __init__(self, port):
         self.start()
 
     def run(self):
-        s = self._sock
-        s.listen(1)
-        con, _ = s.accept()
+        sock = self._sock
+        sock.listen(1)
+        con, _ = sock.accept()
         while True:
-            d = con.recv(4096)
-            if not d:
+            data = con.recv(4096)
+            if not data:
                 break
-            self._buf.write(d)
+            self._buf.write(data)
         con.close()
-        s.close()
+        sock.close()
         self._sock = None
 
     def wait(self):
@@ -40,5 +44,6 @@ def wait(self):
     def get_recieved(self):
         self.wait()
         self._buf.seek(0)
-        # TODO: have to process string encoding properly. currently we assume that all encoding is utf-8.
+        # TODO: have to process string encoding properly. currently we assume
+        # that all encoding is utf-8.
         return list(Unpacker(self._buf, encoding='utf-8'))

tests/test_event.py

@@ -1,20 +1,23 @@
+# -*- coding: utf-8 -*-
+
 import unittest
 
 from fluent import event, sender
 
+
 sender.setup(server='localhost', tag='app')
 
+
 class TestHandler(unittest.TestCase):
     def testLogging(self):
         # send event with tag app.follow
         event.Event('follow', {
-          'from': 'userA',
-          'to':   'userB'
+            'from': 'userA',
+            'to':   'userB'
         })
 
         # send event with tag app.follow, with timestamp
         event.Event('follow', {
-          'from': 'userA',
-          'to':   'userB'
+            'from': 'userA',
+            'to':   'userB'
         }, time=int(0))
-

tests/test_handler.py

@@ -1,8 +1,13 @@
-import unittest
-from tests import mockserver
+# -*- coding: utf-8 -*-
+
 import logging
+import unittest
+
 import fluent.handler
 
+from tests import mockserver
+
+
 class TestLogger(unittest.TestCase):
     def setUp(self):
         super(TestLogger, self).setUp()
@@ -11,23 +16,23 @@ def setUp(self):
                 self._server = mockserver.MockRecvServer(port)
                 self._port = port
                 break
-            except IOError as e:
+            except IOError:
                 pass
 
     def get_data(self):
         return self._server.get_recieved()
 
     def test_simple(self):
-        h = fluent.handler.FluentHandler('app.follow', port=self._port)
+        handler = fluent.handler.FluentHandler('app.follow', port=self._port)
 
         logging.basicConfig(level=logging.INFO)
-        l = logging.getLogger('fluent.test')
-        l.addHandler(h)
-        l.info({
+        log = logging.getLogger('fluent.test')
+        log.addHandler(handler)
+        log.info({
             'from': 'userA',
             'to': 'userB'
         })
-        h._close()
+        handler._close()
 
         data = self.get_data()
         eq = self.assertEqual

tests/test_sender.py

@@ -1,22 +1,25 @@
+# -*- coding: utf-8 -*-
+
 from __future__ import print_function
 import unittest
-from tests import mockserver
+
 import fluent.sender
 
+from tests import mockserver
+
+
 class TestSender(unittest.TestCase):
     def setUp(self):
         super(TestSender, self).setUp()
         for port in range(10000, 20000):
             try:
                 self._server = mockserver.MockRecvServer(port)
                 break
-            except IOError as e:
-                print(e)
-                pass
-        self._sender = fluent.sender.FluentSender(
-                tag='test',
-                port=port,
-                )
+            except IOError as exc:
+                print(exc)
+        self._sender = fluent.sender.FluentSender(tag='test',
+                                                  port=port,
+                                                  )
 
     def get_data(self):
         return self._server.get_recieved()
@@ -30,6 +33,6 @@ def test_simple(self):
         eq(1, len(data))
         eq(3, len(data[0]))
         eq('test.foo', data[0][0])
-        eq({'bar':'baz'}, data[0][2])
+        eq({'bar': 'baz'}, data[0][2])
         self.assert_(data[0][1])
         self.assert_(isinstance(data[0][1], int))