finish removing six

Author: Carreau

setup.py

@@ -75,7 +75,6 @@
 
 install_requires = setuptools_args['install_requires'] = [
     'ipython_genutils',
-    'six',
     'funcsigs',
 ]
 

traitlets/config/application.py

@@ -25,7 +25,6 @@
 from ipython_genutils import py3compat
 from ipython_genutils.importstring import import_item
 from ipython_genutils.text import indent, wrap_paragraphs, dedent
-import six
 
 
 #-----------------------------------------------------------------------------

traitlets/config/loader.py

@@ -15,7 +15,6 @@
 from ipython_genutils.path import filefind
 from ipython_genutils import py3compat
 from ipython_genutils.encoding import DEFAULT_ENCODING
-from six import text_type, string_types, PY3
 from traitlets.traitlets import (
     HasTraits, Container, List, Dict, Any, Undefined,
 )
@@ -491,12 +490,7 @@ def get_config():
             get_config=get_config,
             __file__=self.full_filename,
         )
-        # encode filename to bytes only on py2 on non-Windows:
-        if PY3 or sys.platform.startswith('win'):
-            conf_filename = self.full_filename
-        else:
-            fs_encoding = sys.getfilesystemencoding() or 'ascii'
-            conf_filename = self.full_filename.encode(fs_encoding)
+        conf_filename = self.full_filename
         py3compat.execfile(conf_filename, namespace)
 
 

traitlets/config/manager.py

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

traitlets/config/tests/test_configurable.py

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

traitlets/tests/_warnings.py

@@ -53,8 +53,6 @@ def all_warnings():
     del frame
 
     for mod_name, mod in list(sys.modules.items()):
-        if 'six.moves' in mod_name:
-            continue
         try:
             mod.__warningregistry__.clear()
         except AttributeError:

traitlets/tests/test_traitlets.py

@@ -25,8 +25,6 @@
     observe_compat, BaseDescriptor, HasDescriptors,
 )
 
-import six
-
 def change_dict(*ordered_values):
     change_names = ('name', 'old', 'new', 'owner', 'type')
     return dict(zip(change_names, ordered_values))
@@ -1239,8 +1237,6 @@ 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 six.PY3:
-        _bad_values.extend([long(10), long(-10), 10*sys.maxint, -10*sys.maxint])
 
 
 class CIntTrait(HasTraits):
@@ -1271,48 +1267,38 @@ class TestMinBoundCInt(TestCInt):
 
 class LongTrait(HasTraits):
 
-    value = Long(99 if six.PY3 else long(99))
+    value = Long(99)
 
 class TestLong(TraitTestBase):
 
     obj = LongTrait()
 
-    _default_value = 99 if six.PY3 else long(99)
+    _default_value = 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 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),)])
-
-    @mark.skipif(six.PY3, reason="not relevant on py3")
-    def test_cast_small(self):
-        """Long casts ints to long"""
-        self.obj.value = 10
-        self.assertEqual(type(self.obj.value), long)
 
 
 class MinBoundLongTrait(HasTraits):
-    value = Long(99 if six.PY3 else long(99), min=5)
+    value = Long(99, min=5)
 
 class TestMinBoundLong(TraitTestBase):
     obj = MinBoundLongTrait()
 
-    _default_value = 99 if six.PY3 else long(99)
+    _default_value = 99
     _good_values   = [5, 10]
     _bad_values    = [4, -10]
 
 
 class MaxBoundLongTrait(HasTraits):
-    value = Long(5 if six.PY3 else long(5), max=10)
+    value = Long(5, max=10)
 
 class TestMaxBoundLong(TraitTestBase):
     obj = MaxBoundLongTrait()
 
-    _default_value = 5 if six.PY3 else long(5)
+    _default_value = 5
     _good_values   = [10, -2]
     _bad_values    = [11, 20]
 
@@ -1323,13 +1309,13 @@ class CLongTrait(HasTraits):
 class TestCLong(TraitTestBase):
     obj = CLongTrait()
 
-    _default_value = 5 if six.PY3 else long(5)
+    _default_value = 5
     _good_values   = ['10', '-10', u'10', u'-10', 10, 10.0, -10.0, 10.1]
     _bad_values    = ['ten', u'ten', [10], {'ten': 10},(10,),
                       None, 1j, '10.1', u'10.1']
 
     def coerce(self, n):
-        return int(n) if six.PY3 else long(n)
+        return int(n)
 
 
 class MaxBoundCLongTrait(HasTraits):
@@ -1338,7 +1324,7 @@ class MaxBoundCLongTrait(HasTraits):
 class TestMaxBoundCLong(TestCLong):
     obj = MaxBoundCLongTrait()
 
-    _default_value = 5 if six.PY3 else long(5)
+    _default_value = 5
     _good_values   = [10, '10', 10.3]
     _bad_values    = [11.0, '11']
 
@@ -1353,13 +1339,6 @@ class TestInteger(TestLong):
     def coerce(self, n):
         return int(n)
 
-    @mark.skipif(six.PY3, reason="not relevant on py3")
-    def test_cast_small(self):
-        """Integer casts small longs to int"""
-
-        self.obj.value = long(100)
-        self.assertEqual(type(self.obj.value), int)
-
 
 class MinBoundIntegerTrait(HasTraits):
     value = Integer(5, min=3)
@@ -1396,8 +1375,6 @@ 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 six.PY3:
-        _bad_values.extend([long(10), long(-10)])
 
 
 class CFloatTrait(HasTraits):
@@ -1429,8 +1406,6 @@ 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 six.PY3:
-        _bad_values.extend([long(10), long(-10)])
 
 
 class BytesTrait(HasTraits):
@@ -1446,8 +1421,6 @@ 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 six.PY3:
-        _bad_values.extend([long(10), long(-10)])
 
 
 class UnicodeTrait(HasTraits):
@@ -1463,8 +1436,6 @@ 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 six.PY3:
-        _bad_values.extend([long(10), long(-10)])
 
 
 class ObjectNameTrait(HasTraits):

traitlets/traitlets.py

@@ -53,8 +53,6 @@
     ClassTypes = (type,)
 from warnings import warn, warn_explicit
 
-import six
-
 from .utils.getargspec import getargspec
 from .utils.importstring import import_item
 from .utils.sentinel import Sentinel

traitlets/utils/getargspec.py

@@ -9,7 +9,6 @@
 """
 
 import inspect
-from six import PY3
 
 # Unmodified from sphinx below this line
 

traitlets/utils/importstring.py

@@ -5,7 +5,6 @@
 # Distributed under the terms of the Modified BSD License.
 
 from ipython_genutils.py3compat import cast_bytes_py2
-from six import string_types
 
 def import_item(name):
     """Import and return ``bar`` given the string ``foo.bar``.