Remove uses of ipython_genutils.py3compat

Author: SylvainCorlay

setup.py

@@ -78,6 +78,7 @@
 
 install_requires = setuptools_args['install_requires'] = [
     'ipython_genutils',
+    'six',
     'decorator',
 ]
 

traitlets/config/application.py

@@ -26,7 +26,9 @@
 from ipython_genutils.importstring import import_item
 from ipython_genutils.text import indent, wrap_paragraphs, dedent
 from ipython_genutils import py3compat
-from ipython_genutils.py3compat import string_types, iteritems
+
+import six
+from six import iteritems
 
 #-----------------------------------------------------------------------------
 # Descriptions for the various sections
@@ -162,7 +164,7 @@ def _classes_inc_parents(self):
     def _log_level_changed(self, change):
         """Adjust the log level when log_level is set."""
         new = change['new']
-        if isinstance(new, string_types):
+        if isinstance(new, six.string_types):
             new = getattr(logging, new)
             self.log_level = new
         self.log.setLevel(new)
@@ -228,10 +230,10 @@ def _log_default(self):
     def _flags_changed(self, change):
         """ensure flags dict is valid"""
         new = change['new']
-        for key, value in new.items():
+        for key, value in iteritems(new):
             assert len(value) == 2, "Bad flag: %r:%s" % (key, value)
             assert isinstance(value[0], (dict, Config)), "Bad flag: %r:%s" % (key, value)
-            assert isinstance(value[1], string_types), "Bad flag: %r:%s" % (key, value)
+            assert isinstance(value[1], six.string_types), "Bad flag: %r:%s" % (key, value)
 
 
     # subcommands for launching other applications
@@ -415,7 +417,7 @@ def initialize_subcommand(self, subc, argv=None):
         """Initialize a subcommand with argv."""
         subapp,help = self.subcommands.get(subc)
 
-        if isinstance(subapp, string_types):
+        if isinstance(subapp, six.string_types):
             subapp = import_item(subapp)
 
         # clear existing instances

traitlets/config/configurable.py

@@ -12,7 +12,7 @@
 from .loader import Config, LazyConfigValue, _is_section_key
 from traitlets.traitlets import HasTraits, Instance, observe, observe_compat, default
 from ipython_genutils.text import indent, dedent, wrap_paragraphs
-from ipython_genutils.py3compat import iteritems
+from six import iteritems
 
 
 #-----------------------------------------------------------------------------

traitlets/config/loader.py

@@ -16,7 +16,7 @@
 from ipython_genutils.path import filefind
 from ipython_genutils import py3compat
 from ipython_genutils.encoding import DEFAULT_ENCODING
-from ipython_genutils.py3compat import unicode_type, iteritems
+from six import text_type, iteritems
 from traitlets.traitlets import HasTraits, List, Any
 
 #-----------------------------------------------------------------------------
@@ -603,7 +603,7 @@ def _decode_argv(self, argv, enc=None):
         if enc is None:
             enc = DEFAULT_ENCODING
         for arg in argv:
-            if not isinstance(arg, unicode_type):
+            if not isinstance(arg, text_type):
                 # only decode if not already decoded
                 arg = arg.decode(enc)
             uargv.append(arg)
@@ -793,9 +793,9 @@ def _add_arguments(self, aliases=None, flags=None):
             else:
                 nargs = None
             if len(key) is 1:
-                paa('-'+key, '--'+key, type=unicode_type, dest=value, nargs=nargs)
+                paa('-'+key, '--'+key, type=text_type, dest=value, nargs=nargs)
             else:
-                paa('--'+key, type=unicode_type, dest=value, nargs=nargs)
+                paa('--'+key, type=text_type, dest=value, nargs=nargs)
         for key, (value, help) in iteritems(flags):
             if key in self.aliases:
                 #

traitlets/config/manager.py

@@ -7,8 +7,8 @@
 import json
 import os
 
+from six import PY3
 from traitlets.config import LoggingConfigurable
-from ipython_genutils.py3compat import PY3
 from traitlets.traitlets import Unicode
 
 

traitlets/config/tests/test_configurable.py

@@ -22,7 +22,7 @@
 )
 
 from traitlets.config.loader import Config
-from ipython_genutils.py3compat import PY3
+from six import PY3
 
 from ...tests._warnings import expected_warnings
 

traitlets/tests/test_traitlets.py

@@ -13,7 +13,7 @@
 from ._warnings import expected_warnings
 
 from nose2.compat import unittest
-from unittest import TestCase
+from unittest import TestCase, skipif
 from nose2.tools.such import helper as testhelper
 
 from traitlets import (
@@ -24,7 +24,8 @@
     ForwardDeclaredType, ForwardDeclaredInstance, validate, observe, default,
     observe_compat, BaseDescriptor, HasDescriptors,
 )
-from ipython_genutils import py3compat
+
+import six
 
 def change_dict(*ordered_values):
     change_names = ('name', 'old', 'new', 'owner', 'type')
@@ -1143,30 +1144,30 @@ class TestInt(TraitTestBase):
     _bad_values    = ['ten', u'ten', [10], {'ten': 10}, (10,), None, 1j,
                       10.1, -10.1, '10L', '-10L', '10.1', '-10.1', u'10L',
                       u'-10L', u'10.1', u'-10.1',  '10', '-10', u'10', -200]
-    if not py3compat.PY3:
+    if not six.PY3:
         _bad_values.extend([long(10), long(-10), 10*sys.maxint, -10*sys.maxint])
 
 
 class LongTrait(HasTraits):
 
-    value = Long(99 if py3compat.PY3 else long(99))
+    value = Long(99 if six.PY3 else long(99))
 
 class TestLong(TraitTestBase):
 
     obj = LongTrait()
 
-    _default_value = 99 if py3compat.PY3 else long(99)
+    _default_value = 99 if six.PY3 else long(99)
     _good_values   = [10, -10]
     _bad_values    = ['ten', u'ten', [10], {'ten': 10},(10,),
                       None, 1j, 10.1, -10.1, '10', '-10', '10L', '-10L', '10.1',
                       '-10.1', u'10', u'-10', u'10L', u'-10L', u'10.1',
                       u'-10.1']
-    if not py3compat.PY3:
+    if not six.PY3:
         # maxint undefined on py3, because int == long
         _good_values.extend([long(10), long(-10), 10*sys.maxint, -10*sys.maxint])
         _bad_values.extend([[long(10)], (long(10),)])
 
-    @unittest.skipIf(py3compat.PY3, "not relevant on py3")
+    @skipif(six.PY3, "not relevant on py3")
     def test_cast_small(self):
         """Long casts ints to long"""
         self.obj.value = 10
@@ -1183,10 +1184,10 @@ class TestInteger(TestLong):
     def coerce(self, n):
         return int(n)
 
-    @unittest.skipIf(py3compat.PY3, "not relevant on py3")
+    @skipif(six.PY3, "not relevant on py3")
     def test_cast_small(self):
         """Integer casts small longs to int"""
-        if py3compat.PY3:
+        if six.PY3:
             raise unittest.SkipTest("not relevant on py3")
 
         self.obj.value = long(100)
@@ -1206,7 +1207,7 @@ class TestFloat(TraitTestBase):
     _bad_values    = ['ten', u'ten', [10], {'ten': 10}, (10,), None,
                       1j, '10', '-10', '10L', '-10L', '10.1', '-10.1', u'10',
                       u'-10', u'10L', u'-10L', u'10.1', u'-10.1', 201.0]
-    if not py3compat.PY3:
+    if not six.PY3:
         _bad_values.extend([long(10), long(-10)])
 
 
@@ -1222,7 +1223,7 @@ class TestComplex(TraitTestBase):
     _good_values   = [10, -10, 10.1, -10.1, 10j, 10+10j, 10-10j,
                       10.1j, 10.1+10.1j, 10.1-10.1j]
     _bad_values    = [u'10L', u'-10L', 'ten', [10], {'ten': 10},(10,), None]
-    if not py3compat.PY3:
+    if not six.PY3:
         _bad_values.extend([long(10), long(-10)])
 
 
@@ -1239,7 +1240,7 @@ class TestBytes(TraitTestBase):
                       b'-10L', b'10.1', b'-10.1', b'string']
     _bad_values    = [10, -10, 10.1, -10.1, 1j, [10],
                       ['ten'],{'ten': 10},(10,), None,  u'string']
-    if not py3compat.PY3:
+    if not six.PY3:
         _bad_values.extend([long(10), long(-10)])
 
 
@@ -1256,7 +1257,7 @@ class TestUnicode(TraitTestBase):
                       '-10.1', '', u'', 'string', u'string', u"€"]
     _bad_values    = [10, -10, 10.1, -10.1, 1j,
                       [10], ['ten'], [u'ten'], {'ten': 10},(10,), None]
-    if not py3compat.PY3:
+    if not six.PY3:
         _bad_values.extend([long(10), long(-10)])