Merge branch 'matthw-master'

tdicola · tdicola · commit 76735db21020 · 2015-05-07T23:09:02.000Z
diff --git a/Adafruit_GPIO/FT232H.py b/Adafruit_GPIO/FT232H.py
@@ -346,9 +346,9 @@ def setup_pins(self, pins, values={}, write=True):
         pins can be provided in the values dict (with pin name to pin value).
         """
         # General implementation that can be improved by subclasses.
-        for pin, mode in pins.iteritems():
+        for pin, mode in iter(pins.items()):
             self._setup_pin(pin, mode)
-        for pin, value in values.iteritems():
+        for pin, value in iter(values.items()):
             self._output_pin(pin, value)
         if write:
             self.mpsse_write_gpio()
@@ -372,7 +372,7 @@ def output_pins(self, pins, write=True):
         name to pin value (HIGH/True for 1, LOW/False for 0).  All provided pins
         will be set to the given values.
         """
-        for pin, value in pins.iteritems():
+        for pin, value in iter(pins.items()):
             self._output_pin(pin, value)
         if write:
             self.mpsse_write_gpio()
diff --git a/Adafruit_GPIO/GPIO.py b/Adafruit_GPIO/GPIO.py
@@ -80,15 +80,15 @@ def output_pins(self, pins):
         # manually.  This is not optimized, but subclasses can choose to implement
         # a more optimal batch output implementation.  See the MCP230xx class for
         # example of optimized implementation.
-        for pin, value in pins.iteritems():
+        for pin, value in iter(pins.items()):
             self.output(pin, value)
 
     def setup_pins(self, pins):
         """Setup multiple pins as inputs or outputs at once.  Pins should be a
         dict of pin name to pin type (IN or OUT).
         """
         # General implementation that can be improved by subclasses.
-        for pin, value in pins.iteritems():
+        for pin, value in iter(pins.items()):
             self.setup(pin, value)
 
     def add_event_detect(self, pin, edge):
diff --git a/Adafruit_GPIO/MCP230xx.py b/Adafruit_GPIO/MCP230xx.py
@@ -88,7 +88,7 @@ def output_pins(self, pins):
         will be set to the given values.
         """
         # Set each changed pin's bit.
-        for pin, value in pins.iteritems():
+        for pin, value in iter(pins.items()):
             if value:
                 self.gpio[int(pin/8)] |= 1 << (int(pin%8))
             else:
diff --git a/Adafruit_GPIO/__init__.py b/Adafruit_GPIO/__init__.py
@@ -1 +1,3 @@
-from GPIO import *
+from __future__ import absolute_import
+
+from Adafruit_GPIO.GPIO import *
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
     requires.append('spidev')
 
 setup(name              = 'Adafruit_GPIO',
-      version           = '0.9.1',
+      version           = '0.9.2',
       author            = 'Tony DiCola',
       author_email      = 'tdicola@adafruit.com',
       description       = 'Library to provide a cross-platform GPIO interface on the Raspberry Pi and Beaglebone Black using the RPi.GPIO and Adafruit_BBIO libraries.',
