Merge pull request #25 from dbrgn/py3

Declare Python 3 compatibility

.travis.yml

@@ -3,10 +3,10 @@ sudo: false
 language: python
 python:
     - 2.7
+    - 3.4
     - 3.5
+    - 3.6
 matrix:
-  allow_failures:
-    - python: 3.5
   fast_finish: true
 install:
     - pip install -r requirements-dev.txt

README.rst

@@ -41,8 +41,7 @@ Of these, *Tangible* does the first three steps. The fourth step is handled by
 a programmatic CAD tool like *OpenSCAD* or *ImplicitSCAD* and the last four
 steps are handled by the specific 3D printer software.
 
-Currently supported Python version is 2.7. Support for 3.4+ is
-planned.
+Currently supported Python version is 2.7 and 3.4+.
 
 This library was my student research project thesis at `HSR <http://hsr.ch/>`_.
 You can find the thesis paper here: https://files.dbrgn.ch/sa-thesis.pdf

docs/examples.rst

@@ -157,7 +157,7 @@ example <example_csv>` into months, a :class:`BarsND
     from tangible.backends.openscad import OpenScadBackend
 
     # Read data into list
-    datapoints = [list() for i in xrange(9)]
+    datapoints = [list() for i in range(9)]
     with open('analytics-full-13.csv', 'r') as datafile:
         reader = csv.DictReader(datafile)
         for row in reader:
@@ -209,7 +209,7 @@ The easiest and cleanest way to do this, is to create a subclass of the
     class Cogwheel(BaseShape):
         def _build_ast(self):
             cogs = []
-            for i in xrange(18):
+            for i in range(18):
                 cog = ast.Rectangle(2, 2)
                 translated = ast.Translate(9.5, -1, 0, cog)
                 rotated = ast.Rotate(i * 30, (0, 0, 1), translated)

setup.py

@@ -23,6 +23,11 @@
           'Programming Language :: Python',
           'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 3.4',
+          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.7',
           'Topic :: Artistic Software',
           'Topic :: Multimedia :: Graphics :: 3D Modeling',
           'Topic :: Scientific/Engineering :: Visualization',

tangible/backends/openscad.py

@@ -11,7 +11,7 @@ class Statement(object):
     def __init__(self, text, *args, **kwargs):
         self.suffix = kwargs.pop('suffix', ';')
         if kwargs:
-            raise TypeError('invalid keyword arguments %r' % (kwargs.keys(),))
+            raise TypeError('invalid keyword arguments %r' % list(kwargs.keys()))
         if args:
             text = text.format(*args)
         self.text = text
@@ -29,7 +29,7 @@ def __init__(self, text, *args, **kwargs):
         self.prefix = kwargs.pop('prefix', '{')
         self.suffix = kwargs.pop('suffix', '};')
         if kwargs:
-            raise TypeError('invalid keyword arguments %r' % (kwargs.keys(),))
+            raise TypeError('invalid keyword arguments %r' % list(kwargs.keys()))
         self.title = Statement(text, *args, suffix='')
         self.children = []
         self.stack = []
@@ -41,7 +41,7 @@ def _get_head(self):
             return self.stack[-1]
 
     def emptyline(self, count=1):
-        for i in xrange(count):
+        for i in range(count):
             self._get_head().children.append(EmptyStatement)
 
     def statement(self, *args, **kwargs):