Switch to use pure python I2C interface with python 2 & 3 compatibility vs. older python-smbus library.

tdicola · tdicola · commit fdf0fca418fa · 2016-04-20T19:27:50.000Z
diff --git a/Adafruit_GPIO/I2C.py b/Adafruit_GPIO/I2C.py
@@ -22,8 +22,6 @@
 import logging
 import subprocess
 
-import smbus
-
 import Adafruit_GPIO.Platform as Platform
 
 
@@ -56,14 +54,14 @@ def get_default_bus():
     else:
         raise RuntimeError('Could not determine default I2C bus for platform.')
 
-def get_i2c_device(address, busnum=None, **kwargs):
+def get_i2c_device(address, busnum=None, i2c_interface=None, **kwargs):
     """Return an I2C device for the specified address and on the specified bus.
     If busnum isn't specified, the default I2C bus for the platform will attempt
     to be detected.
     """
     if busnum is None:
         busnum = get_default_bus()
-    return Device(address, busnum, **kwargs)
+    return Device(address, busnum, i2c_interface, **kwargs)
 
 def require_repeated_start():
     """Enable repeated start conditions for I2C register reads.  This is the
@@ -85,14 +83,21 @@ def require_repeated_start():
 
 
 class Device(object):
-    """Class for communicating with an I2C device using the smbus library.
-    Allows reading and writing 8-bit, 16-bit, and byte array values to registers
+    """Class for communicating with an I2C device using the adafruit-pureio pure
+    python smbus library, or other smbus compatible I2C interface. Allows reading
+    and writing 8-bit, 16-bit, and byte array values to registers
     on the device."""
-    def __init__(self, address, busnum):
+    def __init__(self, address, busnum, i2c_interface=None):
         """Create an instance of the I2C device at the specified address on the
         specified I2C bus number."""
         self._address = address
-        self._bus = smbus.SMBus(busnum)
+        if i2c_interface is None:
+            # Use pure python I2C interface if none is specified.
+            import Adafruit_PureIO.smbus
+            self._bus = Adafruit_PureIO.smbus.SMBus(busnum)
+        else:
+            # Otherwise use the provided class to create an smbus interface.
+            self._bus = i2c_interface(busnum)
         self._logger = logging.getLogger('Adafruit_I2C.Device.Bus.{0}.Address.{1:#0X}' \
                                 .format(busnum, address))
 
diff --git a/setup.py b/setup.py
@@ -5,13 +5,13 @@
 import sys
 
 # Define required packages.
-requires = []
+requires = ['adafruit-pureio']
 # Assume spidev is required on non-windows & non-mac platforms (i.e. linux).
 if sys.platform != 'win32' and sys.platform != 'darwin':
     requires.append('spidev')
 
 setup(name              = 'Adafruit_GPIO',
-      version           = '0.9.3',
+      version           = '1.0.0',
       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.',
