Add Python 3 compatibility (#8)

pyautocad/api.py

@@ -32,6 +32,7 @@
     ACAD = None
 
 import pyautocad.types
+from pyautocad.compat import basestring, xrange
 
 logger = logging.getLogger(__name__)
 

pyautocad/cache.py

@@ -11,6 +11,7 @@
     :copyright: (c) 2012 by Roman Haritonov.
     :license: BSD, see LICENSE.txt for more details.
 """
+from __future__ import print_function
 
 
 class Cached(object):
@@ -90,19 +91,17 @@ def __delattr__(self, key):
         object.__delattr__(self._instance, key)
 
 
-
-
 if __name__ == "__main__":
     import time
 
     class Foo(object):
         @property
         def x(self):
-            print 'consuming time'
+            print('consuming time')
             time.sleep(1)
             return 42
 
     foo = Foo()
     cached_foo = Cached(foo)
     for i in range(5):
-        print cached_foo.x
+        print(cached_foo.x)

pyautocad/compat.py

@@ -0,0 +1,15 @@
+import sys
+
+IS_PY3 = sys.version_info[0] == 3
+
+if IS_PY3:
+    unicode = str
+    bytes = bytes
+    basestring = str
+    xrange = range
+else:
+    unicode = unicode
+    _orig_bytes = bytes
+    bytes = lambda s, *a: _orig_bytes(s)
+    basestring = basestring
+    xrange = xrange

pyautocad/types.py

@@ -13,6 +13,8 @@
 import operator
 import math
 
+from pyautocad.compat import IS_PY3
+
 
 class APoint(array.array):
     """ 3D point with basic geometric operations and support for passing as a
@@ -100,13 +102,21 @@ def __sub__(self, other):
     def __mul__(self, other):
         return self.__left_op(self, other, operator.mul)
 
-    def __div__(self, other):
-        return self.__left_op(self, other, operator.div)
+    if IS_PY3:
+        def __div__(self, other):
+            return self.__left_op(self, other, operator.truediv)
+    else:
+        def __div__(self, other):
+            return self.__left_op(self, other, operator.div)
 
     __radd__ = __add__
     __rsub__ = __sub__
     __rmul__ = __mul__
     __rdiv__ = __div__
+    __floordiv__ = __div__
+    __rfloordiv__ = __div__
+    __truediv__ = __div__
+    _r_truediv__ = __div__
 
     def __neg__(self):
         return self.__left_op(self, -1, operator.mul)

pyautocad/utils.py

@@ -9,6 +9,7 @@
     :copyright: (c) 2012 by Roman Haritonov.
     :license: BSD, see LICENSE.txt for more details.
 """
+from __future__ import print_function
 
 import sys
 import re
@@ -108,9 +109,7 @@ def timing(message=u'Elapsed'):
         yield begin
     finally:
         elapsed = (time.time() - begin)
-        print u'%s: %.3f s' % (message, elapsed)
-
-
+        print(u'%s: %.3f s' % (message, elapsed))
 
 
 def dynamic_print(text):

tests/test_api.py

@@ -1,10 +1,14 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # date: 16.01.12
+from __future__ import print_function
+import os, sys
+sys.path.insert(0, os.path.abspath('..'))
 from _ctypes import COMError
 import unittest
 
 from pyautocad import Autocad, aDouble, APoint, ACAD
+from pyautocad.compat import unicode
 
 
 NPASS = 3000
@@ -14,7 +18,7 @@ class ApiTestCase(unittest.TestCase):
     def setUp(self):
         self.acad = Autocad(True)
         self.doc = self.acad.app.Documents.Add()
-        print 'Current', self.doc.Name
+        print('Current', self.doc.Name)
 
     def tearDown(self):
         self.doc.Close(False)

tests/test_cached.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#date: 16.01.12
+from __future__ import print_function
+import os, sys
+sys.path.insert(0, os.path.abspath('..'))
 import unittest
 import mock
 
@@ -12,17 +14,17 @@ def __init__(self):
         self._x = None
 
     def getx(self):
-        print "get x"
+        print("get x")
         return self._x
 
     def setx(self, value):
-        print "set x", value
+        print("set x", value)
         self._x = value
 
     x = property(lambda self: self.getx(), lambda self, x: self.setx(x))
 
     def modify(self, val):
-        print "modify", val
+        print("modify", val)
         self._x = val
 
 

tests/test_contrib_tables.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#date: 13.02.12
-import os
+import os, sys
+sys.path.insert(0, os.path.abspath('..'))
 import unittest
 
 from pyautocad.contrib import tables

tests/test_some_ideas.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #date: 13.02.12
+import os, sys
+sys.path.insert(0, os.path.abspath('..'))
 import unittest
 
 from pyautocad import Autocad

tests/test_types.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #date: 17.01.12
+import os, sys
+sys.path.insert(0, os.path.abspath('..'))
 import unittest
 
 from pyautocad.types import APoint, distance
@@ -54,7 +56,6 @@ def test_args(self):
         for arg in wrong_args:
             with self.assertRaises(TypeError):
                 p = APoint(arg)
-                print arg
 
         p = APoint(0, 0, 0)
         for arg in wrong_args:

tests/test_utils.py

@@ -1,15 +1,17 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#date: 16.01.12
+from __future__ import unicode_literals
+import os, sys
+sys.path.insert(0, os.path.abspath('..'))
 import unittest
 
 from pyautocad.utils import unformat_mtext, mtext_to_string, string_to_mtext
 
 class UtilsTestCase(unittest.TestCase):
     def test_unformat(self):
-        texts = [ur'{\fGOST type A|b0|i0|c204|p34;ЩО\fGOST type A|b0|i0|c0|p34;2-8}',
-             ur'text\Pwith {\fWide Latin|b0|i0|c0|p18;multi} {\fVerdana|b0|i0|c0|p34;format}',
-             ur'test\P\pxi-3,l3,t3;1.	list1\P2.	list2\P\pi0,l0,tz;\P\pi-3,l3,t3;{\fSymbol|b0|i0|c2|p18;·	}bullet1\P{\fSymbol|b0|i0|c2|p18;·	}bullet2\P\pi0,l0,tz;\P{\fVani|b0|i0|c0|p34;another font} {\fVerdana|b1|i0|c0|p34;and bold}',
+        texts = [r'{\fGOST type A|b0|i0|c204|p34;ЩО\fGOST type A|b0|i0|c0|p34;2-8}',
+             r'text\Pwith {\fWide Latin|b0|i0|c0|p18;multi} {\fVerdana|b0|i0|c0|p34;format}',
+             r'test\P\pxi-3,l3,t3;1.	list1\P2.	list2\P\pi0,l0,tz;\P\pi-3,l3,t3;{\fSymbol|b0|i0|c2|p18;·	}bullet1\P{\fSymbol|b0|i0|c2|p18;·	}bullet2\P\pi0,l0,tz;\P{\fVani|b0|i0|c0|p34;another font} {\fVerdana|b1|i0|c0|p34;and bold}',
              ]
         desired1 = [u'ЩО2-8', u'text\Pwith multi format', u'test\P1.	list1\P2.	list2\P\P·	bullet1\P·	bullet2\P\Panother font and bold']
         desired2 = [u'ЩО2-8', u'text\nwith multi format',
@@ -21,8 +23,8 @@ def test_unformat(self):
 ·	bullet2
 
 another font and bold"""]
-        result1 = map(unformat_mtext, texts)
-        result2 = map(mtext_to_string, texts)
+        result1 = list(map(unformat_mtext, texts))
+        result2 = list(map(mtext_to_string, texts))
 
         self.assertEqual(result1, desired1)
         self.assertEqual(result2, desired2)