PEP-0008 code styling

svartalf · svartalf · commit b14539dd1195 · 2012-05-24T09:23:36.000+09:00
diff --git a/quirc/__init__.py b/quirc/__init__.py
@@ -6,4 +6,4 @@
 __version__ = '0.6.2'
 
 import api
-from base import decode
+from base import decode
diff --git a/quirc/api/__init__.py b/quirc/api/__init__.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import constants, exceptions, structures
-from functions import *
+import constants
+import exceptions
+import structures
+from functions import *
diff --git a/quirc/api/constants.py b/quirc/api/constants.py
@@ -30,4 +30,4 @@
     5: 'Unknown data type',
     6: 'Data overflow',
     7: 'Data underflow',
-}
+}
diff --git a/quirc/api/exceptions.py b/quirc/api/exceptions.py
@@ -1,13 +1,16 @@
 # -*- coding: utf-8 -*-
 
+
 class QuircException(BaseException):
+    # TODO: docstring
     pass
 
 
 class DecodeException(QuircException, ValueError):
+    # TODO: docstring
 
     def __init__(self, message):
         self._message = message
 
     def __str__(self):
-        return self._message
+        return self._message
diff --git a/quirc/api/functions.py b/quirc/api/functions.py
@@ -23,6 +23,7 @@
 _new.argtypes = ()
 _new.restype = QuircPointer
 
+
 def new():
     """Construct a new QR-code recognizer.
 
@@ -38,6 +39,7 @@ def new():
 _destroy.argtypes = (QuircPointer,)
 _destroy.restype = None
 
+
 def destroy(structure):
     """Destroy a QR-code recognizer.
 
@@ -51,6 +53,7 @@ def destroy(structure):
 _resize.argtypes = (QuircPointer, ctypes.c_int, ctypes.c_int)
 _resize.restype = ctypes.c_int
 
+
 def resize(structure, width, height):
     """Resize the QR-code recognizer.
 
@@ -66,6 +69,7 @@ def resize(structure, width, height):
 _begin.argtypes = (QuircPointer, c_int_pointer, c_int_pointer)
 _begin.restype = c_uint8_pointer
 
+
 def begin(structure, width, height):
     # TODO: docstring
     # TODO: parameter type check
@@ -76,6 +80,7 @@ def begin(structure, width, height):
 _end.argtypes = (QuircPointer,)
 _end.restype = None
 
+
 def end(structure):
     # TODO: docstring
     # TODO: parameter type check
@@ -85,6 +90,7 @@ def end(structure):
 _count.argtypes = (QuircPointer,)
 _count.restype = ctypes.c_int
 
+
 def count(structure):
     # TODO: docstring
     # TODO: parameter type check
@@ -95,18 +101,24 @@ def count(structure):
 _extract.argtypes = (QuircPointer, ctypes.c_int, CodePointer)
 _extract.restype = ctypes.c_int
 
+
 def extract(structure, idx, code):
     # TODO: doctring
     # TODO: parameter type check
     _extract(structure, idx, ctypes.byref(code))
 
+
 def _decode_errcheck(result, func, arguments):
     if result:
         raise DecodeException(constants._DECODE_ERRORS[result])
 
 _decode = libquirc.quirc_decode
 _decode.argtypes = (CodePointer, DataPointer)
-_decode.restype = ctypes.c_int # TODO: return proper value
+_decode.restype = ctypes.c_int  # TODO: return proper value
 _decode.errcheck = _decode_errcheck
+
+
 def decode(code, data):
-    return _decode(ctypes.byref(code), ctypes.byref(data))
+    # TODO: docstring
+    # TODO: parameter type check
+    return _decode(ctypes.byref(code), ctypes.byref(data))
diff --git a/quirc/api/structures.py b/quirc/api/structures.py
@@ -33,9 +33,9 @@ class Code(ctypes.Structure):
     """This structure is used to return information about detected QR codes in the input image."""
 
     _fields_ = (
-        ('corners', Point*4), # The four corners of the QR-code, from top left, clockwise
+        ('corners', Point * 4),  # The four corners of the QR-code, from top left, clockwise
         ('size', ctypes.c_int),
-        ('cell_bitmap', ctypes.c_uint8*constants.MAX_BITMAP),
+        ('cell_bitmap', ctypes.c_uint8 * constants.MAX_BITMAP),
     )
 
 CodePointer = ctypes.POINTER(Code)
diff --git a/quirc/base.py b/quirc/base.py
@@ -13,6 +13,7 @@
     except ImportError:
         USING_PIL = False
 
+
 def decode(image):
     """Recognize image and return generator with all the available QR codes
 
