Merge pull request #20 from lsst/tickets/DM-15435

DM-15435: Remove python 2 support from pex packages

.gitignore

@@ -1,4 +1,7 @@
 .cache/
+.pytest_cache
+.coverage
+pytest_session.txt
 _build.*
 .sconsign.dblite
 config.log

python/lsst/pex/exceptions/__init__.py

@@ -19,8 +19,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-
 from .version import *
 from .exceptions import *
 from .wrappers import *

python/lsst/pex/exceptions/wrappers.py

@@ -19,18 +19,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-
 __all__ = ["register", "ExceptionMeta", "Exception", "LogicError",
            "DomainError", "InvalidParameterError", "LengthError",
            "OutOfRangeError", "RuntimeError", "RangeError", "OverflowError",
            "UnderflowError", "NotFoundError", "IoError", "TypeError",
            "translate", "declare"]
 
 import warnings
-import builtins
 
-from future.utils import with_metaclass
 from . import exceptions
 
 registry = {}
@@ -54,7 +50,7 @@ def __getattr__(self, name):
 
 
 @register
-class Exception(with_metaclass(ExceptionMeta, builtins.Exception)):
+class Exception(Exception, metaclass=ExceptionMeta):
     """The base class for Python-wrapped LSST C++ exceptions.
     """
 
@@ -110,7 +106,7 @@ class OutOfRangeError(LogicError):
 
 
 @register
-class RuntimeError(Exception, builtins.RuntimeError):
+class RuntimeError(Exception, RuntimeError):
     WrappedClass = exceptions.RuntimeError
 
 
@@ -120,27 +116,27 @@ class RangeError(RuntimeError):
 
 
 @register
-class OverflowError(RuntimeError, builtins.OverflowError):
+class OverflowError(RuntimeError, OverflowError):
     WrappedClass = exceptions.OverflowError
 
 
 @register
-class UnderflowError(RuntimeError, builtins.ArithmeticError):
+class UnderflowError(RuntimeError, ArithmeticError):
     WrappedClass = exceptions.UnderflowError
 
 
 @register
-class NotFoundError(Exception, builtins.LookupError):
+class NotFoundError(Exception, LookupError):
     WrappedClass = exceptions.NotFoundError
 
 
 @register
-class IoError(RuntimeError, builtins.IOError):
+class IoError(RuntimeError, IOError):
     WrappedClass = exceptions.IoError
 
 
 @register
-class TypeError(RuntimeError, builtins.TypeError):
+class TypeError(RuntimeError, TypeError):
     WrappedClass = exceptions.TypeError
 
 

tests/test_Exception_2.py

@@ -19,8 +19,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from builtins import str
-
 import unittest
 
 import lsst.pex.exceptions

ups/pex_exceptions.table

@@ -2,7 +2,6 @@ setupRequired(base)
 setupRequired(boost)
 setupRequired(pybind11)
 setupRequired(python)
-setupRequired(python_future)
 
 envPrepend(LD_LIBRARY_PATH, ${PRODUCT_DIR}/lib)
 envPrepend(DYLD_LIBRARY_PATH, ${PRODUCT_DIR}/lib)