:fix: wrong import of the builtins module in python2.7

b3j0f · Jan 28, 2016 · bc1949c · bc1949c
1 parent 7379407
commit bc1949c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/b3j0f/aop/joinpoint.py b/b3j0f/aop/joinpoint.py
@@ -41,7 +41,7 @@
 
 from opcode import opmap
 
-import builtins
+from six.moves import builtins
 
 from types import MethodType, FunctionType
 

diff --git a/b3j0f/aop/version.py b/b3j0f/aop/version.py
@@ -33,4 +33,4 @@
 # thanks to https://github.com/pycontribs/jira/blob/master/jira/version.py
 
 #: project version
-__version__ = '0.8.0'
+__version__ = '0.8.1'
diff --git a/changelog.rst b/changelog.rst
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.8.1 (2016/01/28)
+------------------
+
+- fix wrong import of builtins in python2.7.
+- add tox file for a better multi-test environment.
+
 0.8.0 (2015/11/09)
 ------------------
 

diff --git a/setup.py b/setup.py
@@ -91,7 +91,8 @@
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5'
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: Implementation :: CPython',
     ],
     test_suite='b3j0f',
     keywords=KEYWORDS

diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,6 @@
+[tox]
+envlist=py27,py30,py31,py34,cpython
+[testenv]
+commands=python setup.py test
+usedevelop=True
+recreate=True