t/t_config

ubuntutools/test/test_config.py

@@ -15,12 +15,15 @@
 # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-import __builtin__
+try:
+    import builtins
+except ImportError:
+    import __builtin__
 import os
 import sys
 import locale
 from io import BytesIO
-from StringIO import StringIO
+from io import StringIO
 
 import mock
 
@@ -47,6 +50,8 @@ class ConfigTestCase(unittest.TestCase):
 
     def setUp(self):
         super(ConfigTestCase, self).setUp()
+        if sys.version_info[0] < 3:
+            self.assertRegex = self.assertRegexpMatches
         m = mock.mock_open()
         m.side_effect = self._fake_open
         patcher = mock.patch('__builtin__.open', m)
@@ -103,8 +108,8 @@ REPEAT=yes
         errs = Logger.stderr.getvalue().strip()
         Logger.stderr = StringIO()
         self.assertEqual(len(errs.splitlines()), 1)
-        self.assertRegexpMatches(errs,
-                                r'Warning: Cannot parse.*\bCOMMAND_EXECUTION=a')
+        self.assertRegex(errs,
+                         r'Warning: Cannot parse.*\bCOMMAND_EXECUTION=a')
 
     def get_value(self, *args, **kwargs):
         config = UDTConfig(prefix='TEST')
@@ -143,8 +148,8 @@ REPEAT=yes
         errs = Logger.stderr.getvalue().strip()
         Logger.stderr = StringIO()
         self.assertEqual(len(errs.splitlines()), 1)
-        self.assertRegexpMatches(errs,
-                                 r'deprecated.*\bCOMPATFOOBAR\b.*\bTEST_QUX\b')
+        self.assertRegex(errs,
+                         r'deprecated.*\bCOMPATFOOBAR\b.*\bTEST_QUX\b')
 
     def test_boolean(self):
         self._config_files['user'] = "TEST_BOOLEAN=yes"
@@ -156,7 +161,7 @@ REPEAT=yes
 
     def test_nonpackagewide(self):
         self._config_files['user'] = 'UBUNTUTOOLS_FOOBAR=a'
-        self.assertEquals(self.get_value('FOOBAR'), None)
+        self.assertEqual(self.get_value('FOOBAR'), None)
 
 
 class UbuEmailTestCase(unittest.TestCase):