Changed code to be Python 3 compatible

Fixed depreciation warnings caused by assertEquals(...)

3 files changed, 20 insertions, 19 deletions

diff --git a/pint/quantity.py b/pint/quantity.py
index 8592cd8..2e2596e 100644
--- a/pint/quantity.py
+++ b/pint/quantity.py
@@ -1212,6 +1212,6 @@ class _Quantity(object):
             if (len(self._units) == 1
                     and not self._REGISTRY.autoconvert_offset_to_baseunit):
                 is_ok = False
-            if self._units.values()[0] != 1:
+            if next(iter(self._units.values())) != 1:
                 is_ok = False
         return is_ok
diff --git a/pint/testsuite/parameterized.py b/pint/testsuite/parameterized.py
index 929e8e8..07a8e01 100644
--- a/pint/testsuite/parameterized.py
+++ b/pint/testsuite/parameterized.py
@@ -2,8 +2,10 @@
 #
 # Adds Parameterized tests for Python's unittest module
 #
-# Code taken from: parameterizedtestcase
-# Author: Marc Abramowitz, License: MIT
+# Code from: parameterizedtestcase, version: 0.1.0
+# Home-page: https://github.com/msabramo/python_unittest_parameterized_test_case
+# Author: Marc Abramowitz, email: marc@marc-abramowitz.com
+# License: MIT
 #
 # Use like this:
 #
@@ -27,6 +29,7 @@ except ImportError:  # pragma: no cover
     import unittest
 
 from functools import wraps
+import collections
 
 
 def augment_method_docstring(method, new_class_dict, classname,
@@ -49,8 +52,8 @@ class ParameterizedTestCaseMetaClass(type):
     def __new__(meta, classname, bases, class_dict):
         new_class_dict = {}
 
-        for attr_name, attr_value in class_dict.items():
-            if callable(attr_value) and hasattr(attr_value, 'param_names'):
+        for attr_name, attr_value in list(class_dict.items()):
+            if isinstance(attr_value, collections.Callable) and hasattr(attr_value, 'param_names'):
                 # print("Processing attr_name = %r; attr_value = %r" % (
                 #     attr_name, attr_value))
 
@@ -77,7 +80,7 @@ class ParameterizedTestCaseMetaClass(type):
             new_method = cls.new_method(method, param_values)
             method_counter[method.__name__] = \
                 method_counter.get(method.__name__, 0) + 1
-            case_data = dict(zip(param_names, param_values))
+            case_data = dict(list(zip(param_names, param_values)))
             case_data['func_name'] = method.__name__
             case_data['case_num'] = method_counter[method.__name__]
 
@@ -97,9 +100,7 @@ class ParameterizedTestCaseMetaClass(type):
         return new_method
 
 
-class ParameterizedTestMixin(object):
-    __metaclass__ = ParameterizedTestCaseMetaClass
-
+class ParameterizedTestMixin(object, metaclass=ParameterizedTestCaseMetaClass):
     @classmethod
     def parameterize(cls, param_names, data,
                      func_name_format='{func_name}_{case_num:05d}'):
@@ -126,5 +127,5 @@ class ParameterizedTestMixin(object):
         return decorator
 
 
-class ParameterizedTestCase(unittest.TestCase, ParameterizedTestMixin):
-    __metaclass__ = ParameterizedTestCaseMetaClass
+class ParameterizedTestCase(unittest.TestCase, ParameterizedTestMixin, metaclass=ParameterizedTestCaseMetaClass):
+    pass
diff --git a/pint/testsuite/test_issues.py b/pint/testsuite/test_issues.py
index bfcba24..1e23661 100644
--- a/pint/testsuite/test_issues.py
+++ b/pint/testsuite/test_issues.py
@@ -268,21 +268,21 @@ class TestIssuesNP(QuantityTestCase):
         q = ureg.meter * x
         self.assertIsInstance(q, ureg.Quantity)
         np.testing.assert_array_equal(q.magnitude, x)
-        self.assertEquals(q.units, ureg.meter.units)
+        self.assertEqual(q.units, ureg.meter.units)
         q = x * ureg.meter
         self.assertIsInstance(q, ureg.Quantity)
         np.testing.assert_array_equal(q.magnitude, x)
-        self.assertEquals(q.units, ureg.meter.units)
+        self.assertEqual(q.units, ureg.meter.units)
 
         m = np.ma.masked_array(2 * np.ones(3,3))
         qq = q * m
         self.assertIsInstance(qq, ureg.Quantity)
         np.testing.assert_array_equal(qq.magnitude, x * m)
-        self.assertEquals(qq.units, ureg.meter.units)
+        self.assertEqual(qq.units, ureg.meter.units)
         qq = m * q
         self.assertIsInstance(qq, ureg.Quantity)
         np.testing.assert_array_equal(qq.magnitude, x * m)
-        self.assertEquals(qq.units, ureg.meter.units)
+        self.assertEqual(qq.units, ureg.meter.units)
 
     @unittest.expectedFailure
     def test_issue39(self):
@@ -291,21 +291,21 @@ class TestIssuesNP(QuantityTestCase):
         q = ureg.meter * x
         self.assertIsInstance(q, ureg.Quantity)
         np.testing.assert_array_equal(q.magnitude, x)
-        self.assertEquals(q.units, ureg.meter.units)
+        self.assertEqual(q.units, ureg.meter.units)
         q = x * ureg.meter
         self.assertIsInstance(q, ureg.Quantity)
         np.testing.assert_array_equal(q.magnitude, x)
-        self.assertEquals(q.units, ureg.meter.units)
+        self.assertEqual(q.units, ureg.meter.units)
 
         m = np.matrix(2 * np.ones(3,3))
         qq = q * m
         self.assertIsInstance(qq, ureg.Quantity)
         np.testing.assert_array_equal(qq.magnitude, x * m)
-        self.assertEquals(qq.units, ureg.meter.units)
+        self.assertEqual(qq.units, ureg.meter.units)
         qq = m * q
         self.assertIsInstance(qq, ureg.Quantity)
         np.testing.assert_array_equal(qq.magnitude, x * m)
-        self.assertEquals(qq.units, ureg.meter.units)
+        self.assertEqual(qq.units, ureg.meter.units)
 
     def test_issue44(self):
         ureg = UnitRegistry()