python3 support via 2to3

Author: miccoli

pyownet/__init__.py

@@ -16,3 +16,5 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+
+__version__ = '0.7.0.dev0'

pyownet/protocol.py

@@ -170,8 +170,8 @@ def __new__(mcs, name, bases, namespace):
             if __debug__:
                 try:
                     namespace['_struct'].pack(*namespace['_defaults'])
-                except struct.error as exp:
-                    raise AssertionError('Unable to pack _defaults: %s' % exp)
+                except struct.error as err:
+                    raise AssertionError('Unable to pack _defaults: %s' % err)
 
         return super(_addfieldprops, mcs).__new__(mcs, name, bases, namespace)
 
@@ -319,25 +319,25 @@ def __init__(self, host='localhost', port=4304, flags=0,
         # resolve host name/port
         try:
             gai = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM)
-        except socket.gaierror as exp:
-            raise ConnError(*exp.args)
+        except socket.gaierror as err:
+            raise ConnError(*err.args)
 
         # gai is a list of tuples, search for the first working one
-        lastexp = None
+        lasterr = None
         for (family, _, _, _, sockaddr) in gai:
             try:
                 conn = OwnetConnection(sockaddr, family, verbose)
-            except socket.error as lastexp:
+            except socket.error as err:
                 # not working, go over to next sockaddr
-                continue
+                lasterr = err
             else:
                 # ok, this is working, stop searching
                 break
         else:
             # no working (sockaddr, family) found: raise error
-            assert isinstance(lastexp, socket.error)
-            assert isinstance(lastexp, IOError)
-            raise ConnError(*lastexp.args)
+            assert isinstance(lasterr, socket.error)
+            assert isinstance(lasterr, IOError)
+            raise ConnError(*lasterr.args)
 
         # here we have an open connection, close for now
         conn.shutdown()
@@ -369,8 +369,8 @@ def sendmess(self, type, payload, flags=0, size=0, offset=0):
                        self.verbose)
             ret, _, data = conn.req(type, payload, flags, size, offset)
             conn.shutdown()
-        except IOError as exp:
-            raise ConnError(*exp.args)
+        except IOError as err:
+            raise ConnError(*err.args)
 
         return ret, data
 
@@ -446,7 +446,7 @@ def _main():
     print("owserver directory on localhost:")
     print("id".center(17), "type".center(7))
     for sensor in proxy.dir(slash=False, bus=False):
-        stype = proxy.read(sensor + '/type')
+        stype = bytes2str(proxy.read(sensor + '/type'))
         print(sensor.ljust(17), stype.ljust(7))
     return 0
 

setup.py

@@ -1,7 +1,14 @@
+from pyownet import __version__
+
 from distutils.core import setup
+try:
+    from distutils.command.build_py import build_py_2to3 as build_py
+except ImportError:
+    # 2.x
+    from distutils.command.build_py import build_py
 
 setup(name = 'pyownet',
-      version = '0.6.2.dev0',
+      version = __version__,
       packages = ['pyownet', ],
       description = 'python ownet client library',
       author = 'Stefano Miccoli',
@@ -12,5 +19,6 @@
           'Environment :: Other Environment',
           'Intended Audience :: Developers',
           'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
-          ]
+          ],
+      cmdclass = {'build_py':build_py}
      )

tests.py

@@ -27,6 +27,8 @@ def test_dir(self):
     def test_exceptions(self):
         self.assertRaises(protocol.OwnetError, self.proxy.dir, '/nonexistent')
         self.assertRaises(protocol.OwnetError, self.proxy.read, '/')
+        self.assertRaises(protocol.ConnError, protocol.OwnetProxy, 
+            host='nonexistent.fake')
 
 if __name__ == '__main__':
     unittest.main()