DM-15435: Remove python 2 support from pex packages

bin.src/validate.py

@@ -23,9 +23,6 @@
 #
 
 #
-from __future__ import print_function
-from builtins import str
-from builtins import object
 import optparse
 import sys
 import os
@@ -40,7 +37,7 @@
 """
 
 
-class PolicyValidator(object):
+class PolicyValidator:
     def __init__(self):
         self.verbose = False
 

bin/prototype_dictionary.py

@@ -19,10 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import print_function
-from builtins import str
-from builtins import object
-
 import optparse
 import sys
 import os
@@ -39,7 +35,7 @@
 """
 
 
-class PolicyValidator(object):
+class PolicyValidator:
     def __init__(self):
         self.verbose = False
 

python/lsst/pex/policy/__init__.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import
 
 from .policySource import *
 from .supportedFormats import *

python/lsst/pex/policy/paf/__init__.py

@@ -1,2 +1 @@
-from __future__ import absolute_import
 from .pafWriter import *

python/lsst/pex/policy/policy/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 
 from .policy import *
 from .policyContinued import *

python/lsst/pex/policy/policy/policyContinued.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 
 __all__ = []
 

src/Dictionary.cc

@@ -308,13 +308,7 @@ void Definition::validateRecurse(const string& name,
 void Definition::validateRecurse(const string& name, const Policy& value,
                                  ValidationError *errs) const
 {
-    if (!getType() == Policy::POLICY) // should have checked this at a higher level
-        throw LSST_EXCEPT
-            (pexExcept::LogicError, string("Wrong type: expected ")
-             + Policy::typeName[Policy::POLICY] + " for " + getPrefix() + name
-             + " but found " + getTypeName() + ". // recurse if we have a sub-definition");
-    // recurse if we have a sub-definition
-    else if (_policy->exists(Dictionary::KW_DICT)) {
+    if (_policy->exists(Dictionary::KW_DICT)) {
         if (!_policy->isPolicy(Dictionary::KW_DICT))
             throw LSST_EXCEPT
                 (DictionaryError, string("Wrong type for ") + getPrefix() + name

tests/test_BigBool.py

@@ -25,9 +25,6 @@
 """
 Comprehensive tests reading and retrieving data of all types
 """
-from __future__ import print_function
-
-from builtins import range
 
 import unittest
 

tests/test_Dictionary_1.py

@@ -20,7 +20,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from builtins import str
 import os
 import unittest
 

tests/test_Dm8654.py

@@ -32,7 +32,6 @@
    pytest test_Dm8654.py
 """
 
-from __future__ import absolute_import, division, print_function
 
 import unittest
 

tests/test_Get.py

@@ -26,8 +26,6 @@
 Comprehensive tests reading and retrieving data of all types
 """
 
-from builtins import range
-
 import os
 import unittest
 

tests/test_Policy_1.py

@@ -27,7 +27,6 @@
 import lsst.utils.tests
 from lsst.pex.policy import Policy, NameNotFound
 import lsst.pex.exceptions
-from past.builtins import long
 
 
 proddir = lsst.utils.getPackageDir('pex_policy')
@@ -93,7 +92,7 @@ def testPolicySetget(self):
         # test types
         p.set("pint", 5)
         self.assertEqual(p.getInt("pint"), 5, "support for type int failed")
-        self.assertIsInstance(p.get("pint"), (int, long),
+        self.assertIsInstance(p.get("pint"), int,
                               "auto-typing for int failed")
         p.set("pdbl", 5.1)
         self.assertAlmostEqual(p.getDouble("pdbl"), 5.1, 7,

tests/test_UrnPolicyFile_1.py

@@ -21,7 +21,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from builtins import str
 import os
 import unittest
 

ups/pex_policy.table

@@ -1,6 +1,5 @@
 setupRequired(daf_base)
 setupRequired(utils)
-setupRequired(python_future)
 setupRequired(pybind11)
 setupRequired(python)