more version_info removal

Author: Carreau

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+addopts = --durations=10

setup.py

@@ -19,8 +19,6 @@
     print(error, file=sys.stderr)
     sys.exit(1)
 
-PY3 = (sys.version_info[0] >= 3)
-
 #-----------------------------------------------------------------------------
 # get on with it
 #-----------------------------------------------------------------------------

traitlets/config/application.py

@@ -363,10 +363,8 @@ def start_show_config(self):
             if not class_config:
                 continue
             print(classname)
-            pformat_kwargs = dict(indent=4)
-            if sys.version_info >= (3,4):
-                # use compact pretty-print on Pythons that support it
-                pformat_kwargs['compact'] = True
+            pformat_kwargs = dict(indent=4, compact=True)
+
             for traitname in sorted(class_config):
                 value = class_config[traitname]
                 print('  .{} = {}'.format(

traitlets/config/tests/test_application.py

@@ -285,8 +285,6 @@ def test_flags(self):
         app.init_bar()
         self.assertEqual(app.bar.enabled, True)
 
-    @mark.skipif(sys.version_info < (3, 4),
-                 reason="Missing `contextlib.redirect_stdout` in python < 3.4!")
     def test_flags_help_msg(self):
         app = MyApp()
         stdout = io.StringIO()
@@ -320,8 +318,6 @@ def test_aliases(self):
         app.init_foo()
         self.assertEqual(app.foo.j, 10)
 
-    @mark.skipif(sys.version_info < (3, 4),
-                 reason="Missing `contextlib.redirect_stdout` in python < 3.4!")
     def test_aliases_help_msg(self):
         app = MyApp()
         stdout = io.StringIO()

traitlets/config/tests/test_configurable.py

@@ -172,8 +172,6 @@ def test_override2(self):
         self.assertEqual(c.b, 'and')
         self.assertEqual(c.c, 20.0)
 
-    @mark.skipif(sys.version_info < (3, ),
-                 reason="Set, Int in py2 get printed as 'set([])', 'Integer'!'")
     def test_help(self):
         self.assertEqual(MyConfigurable.class_get_help(), mc_help)
         self.assertEqual(Foo.class_get_help(), foo_help)
@@ -242,8 +240,6 @@ class MyConf2(Configurable):
         self.assertGreater(cls2_cfg.index(defaults_str),
                            cls2_cfg.index(enum_choices_str))
 
-    @mark.skipif(sys.version_info < (3, ),
-                 reason="Unicodes printed with `u` prefix in PY2!'")
     def test_generated_config_strenum_comments(self):
         help_str = "Many choices."
         defaults_str = "Default: 'choice2'"

traitlets/tests/test_traitlets.py

@@ -1448,10 +1448,7 @@ class TestObjectName(TraitTestBase):
     _good_values = ["a", "gh", "g9", "g_", "_G", u"a345_"]
     _bad_values = [1, "", u"€", "9g", "!", "#abc", "aj@", "a.b", "a()", "a[0]",
                                                         None, object(), object]
-    if sys.version_info[0] < 3:
-        _bad_values.append(u"þ")
-    else:
-        _good_values.append(u"þ")  # þ=1 is valid in Python 3 (PEP 3131).
+    _good_values.append(u"þ")  # þ=1 is valid in Python 3 (PEP 3131).
 
 
 class DottedObjectNameTrait(HasTraits):
@@ -1463,10 +1460,8 @@ class TestDottedObjectName(TraitTestBase):
     _default_value = "a.b"
     _good_values = ["A", "y.t", "y765.__repr__", "os.path.join", u"os.path.join"]
     _bad_values = [1, u"abc.€", "_.@", ".", ".abc", "abc.", ".abc.", None]
-    if sys.version_info[0] < 3:
-        _bad_values.append(u"t.þ")
-    else:
-        _good_values.append(u"t.þ")
+    
+    _good_values.append(u"t.þ")
 
 
 class TCPAddressTrait(HasTraits):