From 81f6a0f4c39ab5e04cfbe9e8c0324ddbdcb39a36 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 27 Nov 2014 16:55:23 -0600
Subject: [PATCH] Remove 2to3 invocation in setup
---
pymbolic/parser.py | 4 ++--
pymbolic/polynomial.py | 2 +-
pymbolic/primitives.py | 1 +
pymbolic/rational.py | 5 ++---
setup.py | 11 +----------
5 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/pymbolic/parser.py b/pymbolic/parser.py
index 4a280e1..cea1e2a 100644
--- a/pymbolic/parser.py
+++ b/pymbolic/parser.py
@@ -1,5 +1,4 @@
-from __future__ import division
-from __future__ import absolute_import
+from __future__ import division, absolute_import
__copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
@@ -24,6 +23,7 @@ THE SOFTWARE.
"""
import pytools.lex
+from six.moves import intern
_imaginary = intern("imaginary")
_float = intern("float")
diff --git a/pymbolic/polynomial.py b/pymbolic/polynomial.py
index 48959ef..ad878fd 100644
--- a/pymbolic/polynomial.py
+++ b/pymbolic/polynomial.py
@@ -1,7 +1,7 @@
from __future__ import division
from __future__ import absolute_import
from __future__ import print_function
-from six.moves import range
+from six.moves import range, intern
__copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
diff --git a/pymbolic/primitives.py b/pymbolic/primitives.py
index df9ffde..f86eaf2 100644
--- a/pymbolic/primitives.py
+++ b/pymbolic/primitives.py
@@ -1,5 +1,6 @@
from __future__ import division
from __future__ import absolute_import
+from six.moves import intern
__copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
diff --git a/pymbolic/rational.py b/pymbolic/rational.py
index 4ca699d..7296881 100644
--- a/pymbolic/rational.py
+++ b/pymbolic/rational.py
@@ -1,6 +1,4 @@
-from __future__ import division
-from __future__ import absolute_import
-from __future__ import print_function
+from __future__ import division, absolute_import, print_function
__copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
@@ -24,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
"""
+from six.moves import intern
import pymbolic.primitives as primitives
import pymbolic.traits as traits
diff --git a/setup.py b/setup.py
index 986e4e5..ba7976c 100644
--- a/setup.py
+++ b/setup.py
@@ -3,12 +3,6 @@
from setuptools 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
-
ver_dic = {}
version_file = open("pymbolic/version.py")
try:
@@ -55,7 +49,4 @@ setup(name="pymbolic",
"pytools>=2",
"pytest>=2.3",
"six",
- ],
-
- # 2to3 invocation
- cmdclass={'build_py': build_py})
+ ])
--
GitLab