Skip to content

Commit 86505e4

Browse files
CarreauCarreau
committed
finish removing six
1 parent 5426c3b commit 86505e4

File tree

10 files changed

+10
-55
lines changed

10 files changed

+10
-55
lines changed

‎setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575

7676
install_requires = setuptools_args['install_requires'] = [
7777
'ipython_genutils',
78-
'six',
7978
'funcsigs',
8079
]
8180

‎traitlets/config/application.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
from ipython_genutils import py3compat
2626
from ipython_genutils.importstring import import_item
2727
from ipython_genutils.text import indent, wrap_paragraphs, dedent
28-
import six
2928

3029

3130
#-----------------------------------------------------------------------------

‎traitlets/config/loader.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from ipython_genutils.path import filefind
1616
from ipython_genutils import py3compat
1717
from ipython_genutils.encoding import DEFAULT_ENCODING
18-
from six import text_type, string_types, PY3
1918
from traitlets.traitlets import (
2019
HasTraits, Container, List, Dict, Any, Undefined,
2120
)
@@ -491,12 +490,7 @@ def get_config():
491490
get_config=get_config,
492491
__file__=self.full_filename,
493492
)
494-
# encode filename to bytes only on py2 on non-Windows:
495-
if PY3 or sys.platform.startswith('win'):
496-
conf_filename = self.full_filename
497-
else:
498-
fs_encoding = sys.getfilesystemencoding() or 'ascii'
499-
conf_filename = self.full_filename.encode(fs_encoding)
493+
conf_filename = self.full_filename
500494
py3compat.execfile(conf_filename, namespace)
501495

502496

‎traitlets/config/manager.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import json
88
import os
99

10-
from six import PY3
1110
from traitlets.config import LoggingConfigurable
1211
from traitlets.traitlets import Unicode
1312

‎traitlets/config/tests/test_configurable.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
)
2323

2424
from traitlets.config.loader import Config
25-
from six import PY3
2625

2726
from ...tests._warnings import expected_warnings
2827

‎traitlets/tests/_warnings.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ def all_warnings():
5353
del frame
5454

5555
for mod_name, mod in list(sys.modules.items()):
56-
if 'six.moves' in mod_name:
57-
continue
5856
try:
5957
mod.__warningregistry__.clear()
6058
except AttributeError:

‎traitlets/tests/test_traitlets.py

Lines changed: 9 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
observe_compat, BaseDescriptor, HasDescriptors,
2626
)
2727

28-
import six
29-
3028
def change_dict(*ordered_values):
3129
change_names = ('name', 'old', 'new', 'owner', 'type')
3230
return dict(zip(change_names, ordered_values))
@@ -1239,8 +1237,6 @@ class TestInt(TraitTestBase):
12391237
_bad_values = ['ten', u'ten', [10], {'ten': 10}, (10,), None, 1j,
12401238
10.1, -10.1, '10L', '-10L', '10.1', '-10.1', u'10L',
12411239
u'-10L', u'10.1', u'-10.1', '10', '-10', u'10', -200]
1242-
if not six.PY3:
1243-
_bad_values.extend([long(10), long(-10), 10*sys.maxint, -10*sys.maxint])
12441240

12451241

12461242
class CIntTrait(HasTraits):
@@ -1271,48 +1267,38 @@ class TestMinBoundCInt(TestCInt):
12711267

12721268
class LongTrait(HasTraits):
12731269

1274-
value = Long(99 if six.PY3 else long(99))
1270+
value = Long(99)
12751271

12761272
class TestLong(TraitTestBase):
12771273

12781274
obj = LongTrait()
12791275

1280-
_default_value = 99 if six.PY3 else long(99)
1276+
_default_value = 99
12811277
_good_values = [10, -10]
12821278
_bad_values = ['ten', u'ten', [10], {'ten': 10},(10,),
12831279
None, 1j, 10.1, -10.1, '10', '-10', '10L', '-10L', '10.1',
12841280
'-10.1', u'10', u'-10', u'10L', u'-10L', u'10.1',
12851281
u'-10.1']
1286-
if not six.PY3:
1287-
# maxint undefined on py3, because int == long
1288-
_good_values.extend([long(10), long(-10), 10*sys.maxint, -10*sys.maxint])
1289-
_bad_values.extend([[long(10)], (long(10),)])
1290-
1291-
@mark.skipif(six.PY3, reason="not relevant on py3")
1292-
def test_cast_small(self):
1293-
"""Long casts ints to long"""
1294-
self.obj.value = 10
1295-
self.assertEqual(type(self.obj.value), long)
12961282

12971283

12981284
class MinBoundLongTrait(HasTraits):
1299-
value = Long(99 if six.PY3 else long(99), min=5)
1285+
value = Long(99, min=5)
13001286

13011287
class TestMinBoundLong(TraitTestBase):
13021288
obj = MinBoundLongTrait()
13031289

1304-
_default_value = 99 if six.PY3 else long(99)
1290+
_default_value = 99
13051291
_good_values = [5, 10]
13061292
_bad_values = [4, -10]
13071293

13081294

13091295
class MaxBoundLongTrait(HasTraits):
1310-
value = Long(5 if six.PY3 else long(5), max=10)
1296+
value = Long(5, max=10)
13111297

13121298
class TestMaxBoundLong(TraitTestBase):
13131299
obj = MaxBoundLongTrait()
13141300

1315-
_default_value = 5 if six.PY3 else long(5)
1301+
_default_value = 5
13161302
_good_values = [10, -2]
13171303
_bad_values = [11, 20]
13181304

@@ -1323,13 +1309,13 @@ class CLongTrait(HasTraits):
13231309
class TestCLong(TraitTestBase):
13241310
obj = CLongTrait()
13251311

1326-
_default_value = 5 if six.PY3 else long(5)
1312+
_default_value = 5
13271313
_good_values = ['10', '-10', u'10', u'-10', 10, 10.0, -10.0, 10.1]
13281314
_bad_values = ['ten', u'ten', [10], {'ten': 10},(10,),
13291315
None, 1j, '10.1', u'10.1']
13301316

13311317
def coerce(self, n):
1332-
return int(n) if six.PY3 else long(n)
1318+
return int(n)
13331319

13341320

13351321
class MaxBoundCLongTrait(HasTraits):
@@ -1338,7 +1324,7 @@ class MaxBoundCLongTrait(HasTraits):
13381324
class TestMaxBoundCLong(TestCLong):
13391325
obj = MaxBoundCLongTrait()
13401326

1341-
_default_value = 5 if six.PY3 else long(5)
1327+
_default_value = 5
13421328
_good_values = [10, '10', 10.3]
13431329
_bad_values = [11.0, '11']
13441330

@@ -1353,13 +1339,6 @@ class TestInteger(TestLong):
13531339
def coerce(self, n):
13541340
return int(n)
13551341

1356-
@mark.skipif(six.PY3, reason="not relevant on py3")
1357-
def test_cast_small(self):
1358-
"""Integer casts small longs to int"""
1359-
1360-
self.obj.value = long(100)
1361-
self.assertEqual(type(self.obj.value), int)
1362-
13631342

13641343
class MinBoundIntegerTrait(HasTraits):
13651344
value = Integer(5, min=3)
@@ -1396,8 +1375,6 @@ class TestFloat(TraitTestBase):
13961375
_bad_values = ['ten', u'ten', [10], {'ten': 10}, (10,), None,
13971376
1j, '10', '-10', '10L', '-10L', '10.1', '-10.1', u'10',
13981377
u'-10', u'10L', u'-10L', u'10.1', u'-10.1', 201.0]
1399-
if not six.PY3:
1400-
_bad_values.extend([long(10), long(-10)])
14011378

14021379

14031380
class CFloatTrait(HasTraits):
@@ -1429,8 +1406,6 @@ class TestComplex(TraitTestBase):
14291406
_good_values = [10, -10, 10.1, -10.1, 10j, 10+10j, 10-10j,
14301407
10.1j, 10.1+10.1j, 10.1-10.1j]
14311408
_bad_values = [u'10L', u'-10L', 'ten', [10], {'ten': 10},(10,), None]
1432-
if not six.PY3:
1433-
_bad_values.extend([long(10), long(-10)])
14341409

14351410

14361411
class BytesTrait(HasTraits):
@@ -1446,8 +1421,6 @@ class TestBytes(TraitTestBase):
14461421
b'-10L', b'10.1', b'-10.1', b'string']
14471422
_bad_values = [10, -10, 10.1, -10.1, 1j, [10],
14481423
['ten'],{'ten': 10},(10,), None, u'string']
1449-
if not six.PY3:
1450-
_bad_values.extend([long(10), long(-10)])
14511424

14521425

14531426
class UnicodeTrait(HasTraits):
@@ -1463,8 +1436,6 @@ class TestUnicode(TraitTestBase):
14631436
'-10.1', '', u'', 'string', u'string', u"€"]
14641437
_bad_values = [10, -10, 10.1, -10.1, 1j,
14651438
[10], ['ten'], [u'ten'], {'ten': 10},(10,), None]
1466-
if not six.PY3:
1467-
_bad_values.extend([long(10), long(-10)])
14681439

14691440

14701441
class ObjectNameTrait(HasTraits):

‎traitlets/traitlets.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@
5353
ClassTypes = (type,)
5454
from warnings import warn, warn_explicit
5555

56-
import six
57-
5856
from .utils.getargspec import getargspec
5957
from .utils.importstring import import_item
6058
from .utils.sentinel import Sentinel

‎traitlets/utils/getargspec.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"""
1010

1111
import inspect
12-
from six import PY3
1312

1413
# Unmodified from sphinx below this line
1514

‎traitlets/utils/importstring.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
# Distributed under the terms of the Modified BSD License.
66

77
from ipython_genutils.py3compat import cast_bytes_py2
8-
from six import string_types
98

109
def import_item(name):
1110
"""Import and return ``bar`` given the string ``foo.bar``.

0 commit comments

Comments
 (0)