misc fixes

- 2to3 on setup.py to allow python 3 import
- removed uneeded circular import in Maps.py
- added missing old_div o mathutils
This commit is contained in:
2016-07-21 14:20:37 +08:00
parent f7a70aa6a7
commit 714afa860f
3 changed files with 3 additions and 11 deletions
-7
View File
@@ -11,7 +11,6 @@ from . import Utils
import numpy as np, scipy.sparse as sp
from scipy.sparse.linalg import LinearOperator
from .Tests import checkDerivative
from .PropMaps import PropMap, Property
from numpy.polynomial import polynomial
from scipy.interpolate import UnivariateSpline
import warnings
@@ -985,9 +984,3 @@ class SplineMap(IdentityMap):
else :
raise Exception
return sp.csr_matrix(np.c_[g1,g2,g3])
+1 -2
View File
@@ -9,6 +9,7 @@ from builtins import object
import numpy as np
import scipy.sparse as sp
from .codeutils import isScalar
from past.utils import old_div
def mkvc(x, numDims=1):
"""Creates a vector with the number of dimension specified
@@ -472,5 +473,3 @@ class Identity(object):
def __ne__(self, v):return (not (1 == v))if self._positive else (not (-1 == v))
def __ge__(self, v):return 1 >= v if self._positive else -1 >= v
def __gt__(self, v):return 1 > v if self._positive else -1 > v
+2 -2
View File
@@ -36,7 +36,7 @@ args = sys.argv[1:]
# Make a `cleanall` rule to get rid of intermediate and library files
if "cleanall" in args:
print "Deleting cython files..."
print("Deleting cython files...")
# Just in case the build directory was created by accident,
# note that shell=True should be OK here because the command is constant.
subprocess.Popen("rm -rf build", shell=True, executable="/bin/bash")
@@ -53,7 +53,7 @@ try:
from Cython.Build import cythonize
from Cython.Distutils import build_ext
USE_CYTHON = True
except Exception, e:
except Exception as e:
USE_CYTHON = False
class NumpyBuild(build_ext):