Imports rewriting

svartalf · svartalf · commit 5be27fb236a1 · 2012-05-23T22:38:38.000+09:00
diff --git a/quirc/__init__.py b/quirc/__init__.py
@@ -3,75 +3,7 @@
 
 """Bindings to QR code decoding library `quirc`"""
 
-import ctypes
-
-from quirc import api
-
-USING_PIL = True
-try:
-    from PIL import Image
-except ImportError:
-    try:
-        import Image
-    except ImportError:
-        USING_PIL = False
-
 __version__ = '0.6.1'
-__all__ = ('api', 'decode')
-
-
-def decode(image):
-    """Recognize image and return generator with all the available QR codes
-
-    Currently supports only PIL Image object as an parameter
-    """
-
-    if not (USING_PIL and isinstance(image, Image.Image)):
-        raise TypeError('Unknown image object type: %s' % type(image))
-
-    # Convert to grayscale mode
-    if image.mode not in ('1', 'L'):
-        image = image.convert('L')
-
-    width, height = image.size
-    pixels = image.load()
-
-    obj = api.new()
-    api.resize(obj, width, height)
-    buffer = api.begin(obj, width, height)
-
-    # Fill buffer with a image pixels. One cell, one pixel.
-    # TODO: looks like a very slow operation
-    idx = 0
-    for i in range(width):
-        for j in range(height):
-            buffer[idx] = ctypes.c_uint8(pixels[j, i])
-            idx += 1
-
-    del idx
-
-    # Finish codes identification
-    api.end(obj)
-
-    num_codes = api.count(obj)
-
-    code = api.structures.Code()
-    data = api.structures.Data()
-
-    for i in range(num_codes):
-
-        # Extract first code
-        api.extract(obj, i, code)
-        api.decode(code, data)
-
-        yield {
-            'corners': tuple([(corner.x, corner.y) for corner in code.corners]),
-            'size': code.size,
-            'version': data.version,
-            'ecc_level': data.ecc_level,
-            'mask': data.mask,
-            'data_type': data.data_type,
-            'text': ctypes.string_at(data.payload, data.payload_len),
-        }
 
-    api.destroy(obj)
+import api
+from base import decode
diff --git a/quirc/api/__init__.py b/quirc/api/__init__.py
@@ -1,9 +1,4 @@
 # -*- coding: utf-8 -*-
 
-from quirc.api.functions import version, new, resize, destroy, begin, end, count, extract, decode
-from quirc.api import constants, functions, structures
-
-__all__ = (
-    'version', 'new', 'resize', 'destroy', 'begin', 'end', 'count', 'extract', 'decode',
-    'constants', 'functions', 'structures'
-)
+import constants, exceptions, structures
+from functions import *
diff --git a/quirc/api/exceptions.py b/quirc/api/exceptions.py
@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 
-
 class QuircException(BaseException):
     pass
 
 
-class DecodeException(QuircException):
+class DecodeException(QuircException, ValueError):
 
     def __init__(self, message):
         self._message = message
diff --git a/quirc/api/functions.py b/quirc/api/functions.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+__all__ = ('version', 'new', 'destroy', 'resize', 'begin', 'end', 'count', 'extract', 'decode')
+
 import ctypes
 from ctypes.util import find_library
 
diff --git a/quirc/base.py b/quirc/base.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+
+import ctypes
+
+from quirc import api
+
+USING_PIL = True
+try:
+    from PIL import Image
+except ImportError:
+    try:
+        import Image
+    except ImportError:
+        USING_PIL = False
+
+def decode(image):
+    """Recognize image and return generator with all the available QR codes
+
+    Currently supports only PIL Image object as an parameter
+    """
+
+    # TODO: `image` type check
+
+    # Convert to grayscale mode
+    if image.mode not in ('1', 'L'):
+        image = image.convert('L')
+
+    width, height = image.size
+    pixels = image.load()
+
+    obj = api.new()
+    api.resize(obj, width, height)
+    buffer = api.begin(obj, width, height)
+
+    # Fill buffer with a image pixels. One cell, one pixel.
+    # TODO: looks like a very slow operation
+    idx = 0
+    for i in range(width):
+        for j in range(height):
+            buffer[idx] = ctypes.c_uint8(pixels[j, i])
+            idx += 1
+
+    del idx
+
+    # Finish codes identification
+    api.end(obj)
+
+    num_codes = api.count(obj)
+
+    code = api.structures.Code()
+    data = api.structures.Data()
+
+    for i in range(num_codes):
+
+        # Extract first code
+        api.extract(obj, i, code)
+        api.decode(code, data)
+
+        yield {
+            'corners': tuple([(corner.x, corner.y) for corner in code.corners]),
+            'size': code.size,
+            'version': data.version,
+            'ecc_level': data.ecc_level,
+            'mask': data.mask,
+            'data_type': data.data_type,
+            'text': ctypes.string_at(data.payload, data.payload_len),
+            }
+
+    api.destroy(obj)
