Python 2/3 support

pingo/__init__.py

@@ -1,32 +1,34 @@
+from __future__ import absolute_import
+
 # api
-from board import ANALOG  # noqa
-from board import IN  # noqa
-from board import OUT  # noqa
-from board import PWM  # noqa
-from board import HIGH  # noqa
-from board import LOW  # noqa
-from board import ModeNotSuported  # noqa
-from board import WrongPinMode  # noqa
-from board import PwmOutputCapable  # noqa
-from board import AnalogInputCapable  # noqa
-from board import Board  # noqa
-from board import PwmPin  # noqa
-from board import AnalogPin  # noqa
-from board import DigitalPin  # noqa
-from board import GroundPin  # noqa
-from board import Pin  # noqa
-from board import VccPin  # noqa
-import parts  # noqa
+from .board import ANALOG  # noqa
+from .board import IN  # noqa
+from .board import OUT  # noqa
+from .board import PWM  # noqa
+from .board import HIGH  # noqa
+from .board import LOW  # noqa
+from .board import ModeNotSuported  # noqa
+from .board import WrongPinMode  # noqa
+from .board import PwmOutputCapable  # noqa
+from .board import AnalogInputCapable  # noqa
+from .board import Board  # noqa
+from .board import PwmPin  # noqa
+from .board import AnalogPin  # noqa
+from .board import DigitalPin  # noqa
+from .board import GroundPin  # noqa
+from .board import Pin  # noqa
+from .board import VccPin  # noqa
+import pingo.parts #import * # noqa
 
 # boards
-import rpi  # noqa
-import ghost  # noqa
-import intel  # noqa
-import udoo  # noqa
-import pcduino  # noqa
-import arduino  # noqa
-import bbb  # noqa
+import pingo.rpi  # noqa
+import pingo.ghost  # noqa
+import pingo.intel  # noqa
+import pingo.udoo  # noqa
+import pingo.pcduino  # noqa
+import pingo.arduino  # noqa
+import pingo.bbb  # noqa
 
 # resources
-import detect  # noqa
-import test  # noqa
+import pingo.detect  # noqa
+import pingo.test  # noqa

pingo/arduino/__init__.py

@@ -1,4 +1,4 @@
-from firmata import ArduinoFirmata  # noqa
-from firmata import get_arduino  # noqa
-from pyun import YunBridge  # noqa
-from pyun import ArduinoYun  # noqa
+from .firmata import ArduinoFirmata  # noqa
+from .firmata import get_arduino  # noqa
+from .pyun import YunBridge  # noqa
+from .pyun import ArduinoYun  # noqa

pingo/arduino/firmata.py

@@ -11,7 +11,7 @@
 from pingo.board import Board, DigitalPin, AnalogPin, PwmPin
 from pingo.board import AnalogInputCapable, PwmOutputCapable
 from pingo.detect import detect
-from util_firmata import pin_list_to_board_dict
+from .util_firmata import pin_list_to_board_dict
 
 PyMata = None
 

pingo/arduino/pyun.py

@@ -47,7 +47,7 @@ def makeURL(self, command, pin, *args):
         else:
             url = self.base_url + '%s/%d' % (command, pin)
         if self.verbose:
-            print '[YunBridge] url: ', url
+            print('[YunBridge] url: %s' % url)
         return url
 
     def get(self, command, pin, *args):

pingo/arduino/test_util_firmata.py

@@ -1,6 +1,6 @@
 import unittest
 
-from util_firmata import pin_list_to_board_dict
+from .util_firmata import pin_list_to_board_dict
 
 
 class FirmataCapabilityDetect(unittest.TestCase):

pingo/bbb/__init__.py

@@ -1 +1 @@
-from bbb import BeagleBoneBlack  # noqa
+from .bbb import BeagleBoneBlack  # noqa

pingo/compat.py

@@ -0,0 +1,25 @@
+import sys
+
+PY2 = sys.version_info[0] == 2
+PY3 = (sys.version_info[0] >= 3)
+
+def iteritems(obj, **kwargs):
+    """replacement for six's iteritems for Python2/3 compat
+       uses 'iteritems' if available and otherwise uses 'items'.
+       Passes kwargs to method.
+    """
+    func = getattr(obj, "iteritems", None)
+    if not func:
+        func = obj.items
+    return func(**kwargs)
+
+def iterkeys(obj, **kwargs):
+    func = getattr(obj, "iterkeys", None)
+    if not func:
+        func = obj.keys
+    return func(**kwargs)
+
+if PY2:
+    from UserDict import UserDict
+else:
+    from collections import UserDict

pingo/detect/__init__.py

@@ -1,4 +1,4 @@
-from detect import get_board
+from .detect import get_board
 
 
 def has_module(module_name):

pingo/detect/test_detect.py

@@ -2,7 +2,7 @@
 import platform
 
 import pingo
-import detect
+import pingo.detect
 
 
 class DetectBasics(unittest.TestCase):

pingo/ghost/__init__.py

@@ -1 +1 @@
-from ghost import GhostBoard  # noqa
+from .ghost import GhostBoard  # noqa

pingo/ghost/ghost.py

@@ -1,5 +1,5 @@
 import pingo
-
+from pingo.compat import iteritems
 
 class GhostBoard(
     pingo.Board,
@@ -48,7 +48,7 @@ def __init__(self, filepath=None):
         self._pin_states = pingo.util.StrKeyDict()
         # All pins start on LOW
         # FIXME: use "LOW" instead of 0
-        for location, pin in self.pins.iteritems():
+        for location, pin in iteritems(self.pins):
             self._pin_states[location] = 0 if hasattr(pin, 'state') else None
 
         # Pin 8 starts on HIGH

pingo/intel/__init__.py

@@ -1,2 +1,2 @@
-from intel import Galileo2  # noqa
-from intel import Edison  # noqa
+from .intel import Galileo2  # noqa
+from .intel import Edison  # noqa

pingo/parts/serial/__init__.py

@@ -1 +1 @@
-from lcd import LCD16x2  # noqa
+from .lcd import LCD16x2  # noqa

pingo/parts/spi/__init__.py

@@ -1 +1 @@
-from mcp3008 import Mcp3008  # noqa
+from .mcp3008 import Mcp3008  # noqa

pingo/parts/spi/mcp3008.py

@@ -64,7 +64,7 @@ def test():
         res = ad_chip.read(1)
         volts = float(res) / 1023 * 3.3
         ticks = int(round(float(res) / 1023 * 40)) * '='
-        print display.format(count, res, volts, ticks)
+        print(display.format(count, res, volts, ticks))
         time.sleep(.2)
         count += 1
 

pingo/pcduino/__init__.py

@@ -1 +1 @@
-from pcduino import PcDuino  # noqa
+from .pcduino import PcDuino  # noqa

pingo/rpi/__init__.py

@@ -1,4 +1,4 @@
-from rpi import RaspberryPi  # noqa
-from rpi import RaspberryPiBPlus  # noqa
-from rpi import RaspberryPi2B  # noqa
-from grove import GrovePi  # noqa
+from .rpi import RaspberryPi  # noqa
+from .rpi import RaspberryPiBPlus  # noqa
+from .rpi import RaspberryPi2B  # noqa
+from .grove import GrovePi  # noqa

pingo/test/__init__.py

@@ -1,3 +1,3 @@
-import level0  # noqa
-import level1  # noqa
-import level2  # noqa
+import pingo.test.level0  # noqa
+import pingo.test.level1  # noqa
+import pingo.test.level2  # noqa

pingo/test/level0/__init__.py

@@ -1,2 +1,2 @@
-from cases import BoardBasics  # noqa
-from cases import BoardExceptions  # noqa
+from .cases import BoardBasics  # noqa
+from .cases import BoardExceptions  # noqa

pingo/test/level1/__init__.py

@@ -1,2 +1,2 @@
-from cases import AnalogReadBasics  # noqa
-from cases import AnalogExceptions  # noqa
+from .cases import AnalogReadBasics  # noqa
+from .cases import AnalogExceptions  # noqa

pingo/test/level2/__init__.py

@@ -1,2 +1,2 @@
-from cases import PwmBasics  # noqa
-from cases import PwmExceptions  # noqa
+from .cases import PwmBasics  # noqa
+from .cases import PwmExceptions  # noqa

pingo/test_utils.py

@@ -1,12 +1,12 @@
 import unittest
 
-import util
+from pingo.util import StrKeyDict
 
 
 class StrKeyDictTest(unittest.TestCase):
 
     def setUp(self):
-        self.d = util.StrKeyDict(
+        self.d = StrKeyDict(
             [('2', 'two'), ('4', 'four')]
         )
 

pingo/udoo/__init__.py

@@ -1 +1 @@
-from udoo import Udoo  # noqa
+from .udoo import Udoo  # noqa

pingo/util.py

@@ -1,8 +1,7 @@
 import collections
-import UserDict
+from .compat import (UserDict, iterkeys)
 
-
-class StrKeyDict(UserDict.UserDict):
+class StrKeyDict(UserDict):
     """StrKeyDict always converts non-string keys to `str`
 
     Tests for item retrieval using `d[key]` notation::
@@ -67,7 +66,7 @@ def __setitem__(self, key, item):
         self.data[self.normalize(key)] = item
 
     def __iter__(self):
-        return self.iterkeys()
+        return iterkeys(self)
 
     def update(self, iterable=None, **kwds):
         if iterable is not None: