Removed Python 2 compatibility.

lsst · Oct 13, 2018 · fdca8db · fdca8db
1 parent 385f8a0
commit fdca8db
Show file tree

Hide file tree

Showing 20 changed files with 4 additions and 44 deletions.
diff --git a/examples/shapeletBases.py b/examples/shapeletBases.py
@@ -21,8 +21,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import absolute_import, division, print_function
-from builtins import range
 import lsst.shapelet
 from lsst.afw import geom
 from lsst.afw.geom import ellipses

diff --git a/examples/timeModels.py b/examples/timeModels.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import numpy
 import pickle
 import os

diff --git a/python/lsst/shapelet/__init__.py b/python/lsst/shapelet/__init__.py
@@ -22,7 +22,6 @@
 
 """lsst.shapelet
 """
-from __future__ import absolute_import, division, print_function
 from .version import *
 
 import lsst.afw.geom

diff --git a/python/lsst/shapelet/constants/__init__.py b/python/lsst/shapelet/constants/__init__.py
@@ -20,8 +20,6 @@
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #/
 
-from __future__ import absolute_import, division, print_function
-
 from .constants import *
 from .constantsContinued import *
 
diff --git a/python/lsst/shapelet/constants/constantsContinued.py b/python/lsst/shapelet/constants/constantsContinued.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 from .constants import BasisTypeEnum
 
 from lsst.utils import continueClass

diff --git a/python/lsst/shapelet/generator.py b/python/lsst/shapelet/generator.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 from builtins import range, object
 from .constants import HERMITE, LAGUERRE, computeSize
 

diff --git a/python/lsst/shapelet/multiShapeletFunction/__init__.py b/python/lsst/shapelet/multiShapeletFunction/__init__.py
@@ -20,8 +20,6 @@
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #/
 
-from __future__ import absolute_import, division, print_function
-
 from .multiShapeletFunction import *
 from .multiShapeletFunctionContinued import *
 
diff --git a/python/lsst/shapelet/multiShapeletFunction/multiShapeletFunctionContinued.py b/python/lsst/shapelet/multiShapeletFunction/multiShapeletFunctionContinued.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 from .multiShapeletFunction import MultiShapeletFunction
 
 from lsst.utils import continueClass

diff --git a/python/lsst/shapelet/radialProfile/__init__.py b/python/lsst/shapelet/radialProfile/__init__.py
@@ -20,8 +20,6 @@
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #/
 
-from __future__ import absolute_import, division, print_function
-
 from .radialProfile import *
 from .radialProfileContinued import *
 
diff --git a/python/lsst/shapelet/radialProfile/radialProfileContinued.py b/python/lsst/shapelet/radialProfile/radialProfileContinued.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import numpy as np
 
 from .radialProfile import RadialProfile

diff --git a/python/lsst/shapelet/shapeletFunction/__init__.py b/python/lsst/shapelet/shapeletFunction/__init__.py
@@ -20,8 +20,6 @@
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #/
 
-from __future__ import absolute_import, division, print_function
-
 from .shapeletFunction import *
 from .shapeletFunctionContinued import *
 
diff --git a/python/lsst/shapelet/shapeletFunction/shapeletFunctionContinued.py b/python/lsst/shapelet/shapeletFunction/shapeletFunctionContinued.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 from .shapeletFunction import ShapeletFunction
 
 from lsst.utils import continueClass

diff --git a/python/lsst/shapelet/tests.py b/python/lsst/shapelet/tests.py
@@ -24,10 +24,6 @@
 Test utility code for shapelets library; here so it can be used
 in multiple test scripts and tests in downstream packages.
 """
-from __future__ import absolute_import, division, print_function
-from builtins import zip
-from builtins import range
-
 import numpy
 try:
     import scipy.ndimage

diff --git a/tests/test_functorKeys.py b/tests/test_functorKeys.py
@@ -19,8 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
-from builtins import range
 import unittest
 
 import numpy as np

diff --git a/tests/test_hermiteTransformMatrix.py b/tests/test_hermiteTransformMatrix.py
@@ -20,8 +20,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import absolute_import, division, print_function
-from builtins import range
 import unittest
 
 import numpy as np

diff --git a/tests/test_matrixBuilder.py b/tests/test_matrixBuilder.py
@@ -19,8 +19,7 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
-from builtins import zip
+
 import unittest
 
 import numpy as np

diff --git a/tests/test_multiShapelet.py b/tests/test_multiShapelet.py
@@ -19,11 +19,7 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
-from future import standard_library
-standard_library.install_aliases()  # noqa E402
-from builtins import zip
-from builtins import range
+
 import pickle
 import unittest
 

diff --git a/tests/test_profiles.py b/tests/test_profiles.py
@@ -19,7 +19,7 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
+
 import unittest
 import os
 

diff --git a/tests/test_projection.py b/tests/test_projection.py
@@ -19,9 +19,7 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
-from builtins import zip
 import unittest
 
 import numpy as np

diff --git a/tests/test_shapeletFunction.py b/tests/test_shapeletFunction.py
@@ -19,10 +19,7 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
-from future import standard_library
-standard_library.install_aliases()  # noqa E402
-from builtins import zip
+
 import unittest
 import pickle