Various additional fixes and simplifications.

Author: mdickinson

docs/source/_extensions/refactordoc/line_functions.py

@@ -9,6 +9,7 @@
 #-----------------------------------------------------------------------------
 import re
 
+
 #-----------------------------------------------------------------------------
 #  Pre-compiled regexes
 #-----------------------------------------------------------------------------

docs/source/conf.py

@@ -13,8 +13,9 @@
 # All configuration values have a default value; values that are commented out
 # serve to show the default value.
 from __future__ import print_function
-import sys
+import io
 import os
+import sys
 
 # The docset build will use slightly different formatting rules
 BUILD_DOCSET = bool(os.environ.get('BUILD_DOCSET'))
@@ -143,9 +144,12 @@ def __name__(self):
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
-d = {}
-exec(open(os.path.join('..', '..', 'traits', '__init__.py')).read(), d)
-version = release = d['__version__']
+version_info = {}
+traits_init_path = os.path.join('..', '..', 'traits', '__init__.py')
+with io.open(traits_init_path, "r", encoding="utf-8") as version_module:
+    version_code = compile(version_module.read(), "__init__.py", "exec")
+    exec(version_code, version_info)
+version = release = version_info['__version__']
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:

examples/tutorials/tutor.py

@@ -769,7 +769,7 @@ def run_code(self):
                         del values[name]
 
                 # Execute the current lab code:
-                exec(module[2:] in values, values)
+                exec(module[2:], values, values)
 
                 # fixme: Hack trying to update the Traits UI view of the dict.
                 self.values = {}

setup.py

@@ -180,7 +180,5 @@ def additional_commands():
         platforms=["Windows", "Linux", "Mac OS-X", "Unix", "Solaris"],
         zip_safe=False,
         use_2to3=False,
-        # traits_listener.ListenerItem has a trait *next* which gets
-        # wrongly renamed
         cmdclass=additional_commands(),
     )

traits/__init__.py

@@ -7,7 +7,7 @@
 
 
 __requires__ = [
-    'six'
+    'six',
 ]
 
 class NullHandler(logging.Handler):

traits/has_traits.py

@@ -790,9 +790,9 @@ def _trait_monitor_index ( cls, handler ):
         if type_handler is type( _handler ):
             if (((type_handler is MethodType)  or
                 'cython_function_or_method' in str(type_handler)) and \
-                (six.get_method_self(handler) is not None)):
+                (handler.__self__ is not None)):
                 if ((handler.__name__ == _handler.__name__) and
-                    (six.get_method_self(handler) is six.get_method_self(_handler))):
+                    (handler.__self__ is _handler.__self__)):
                    return i
 
             elif handler == _handler:
@@ -957,7 +957,7 @@ def wrappern(*args):
             if arg is not None:
                 function(arg, *args)
         # Return the correct wrapper depending on the arg count
-        args = six.get_function_code(function).co_argcount-1
+        args = function.__code__.co_argcount-1
         if args == 0:
             return wrapper0
         elif args == 1:
@@ -1947,7 +1947,7 @@ def _trait_view ( cls, name, view_element, default_name, view_elements,
                 result = view_elements.find( name )
                 if (result is None) and (handler is not None):
                     method = getattr( handler, name, None )
-                    if six.callable( method ):
+                    if callable( method ):
                         result = method()
 
                 return result
@@ -1974,7 +1974,7 @@ def _trait_view ( cls, name, view_element, default_name, view_elements,
 
         if handler is not None:
             method = getattr( handler, name, None )
-            if six.callable( method ):
+            if callable( method ):
                 result = method()
                 if isinstance( result, ViewElement ):
                     return result

traits/tests/test_file.py

@@ -1,4 +1,4 @@
-import os.path as osp
+import os
 
 import six
 
@@ -18,8 +18,8 @@ class FastExampleModel(HasTraits):
 class FileTestCase(unittest.TestCase):
     def test_valid_file(self):
         example_model = ExampleModel(file_name=__file__)
-        example_model.file_name = osp.__file__
-        example_model.file_name = six.text_type(osp.__file__)
+        example_model.file_name = os.path.__file__
+        example_model.file_name = six.text_type(os.path.__file__)
 
     def test_invalid_file(self):
         example_model = ExampleModel(file_name=__file__)
@@ -33,7 +33,7 @@ def test_directory(self):
         example_model = ExampleModel(file_name=__file__)
 
         def assign_invalid():
-            example_model.file_name = osp.dirname(__file__)
+            example_model.file_name = os.path.dirname(__file__)
 
         self.assertRaises(TraitError, assign_invalid)
 
@@ -48,4 +48,4 @@ def assign_invalid():
     def test_fast(self):
         example_model = FastExampleModel(file_name=__file__)
         example_model.path = '.'
-        example_model.path = u'.'
+        example_model.path = u'.'

traits/tests/test_listeners.py

@@ -24,7 +24,7 @@
 import threading
 import time
 
-import six.moves as sm
+import six
 
 from traits.testing.unittest_tools import unittest
 
@@ -38,7 +38,7 @@ def captured_stderr():
     Return a context manager that directs all stderr output to a string.
 
     """
-    new_stderr = sm.cStringIO()
+    new_stderr = six.StringIO()
     original_stderr = sys.stderr
     sys.stderr = new_stderr
     try:
@@ -185,7 +185,7 @@ def test_listener_thread_safety(self):
         t = threading.Thread(target=foo_writer, args=(a, stop_event))
         t.start()
 
-        for _ in sm.range(100):
+        for _ in range(100):
             a.on_trait_change(a.foo_changed_handler, 'foo')
             time.sleep(0.0001)  # encourage thread-switch
             a.on_trait_change(a.foo_changed_handler, 'foo', remove=True)

traits/tests/test_new_notifiers.py

@@ -8,10 +8,9 @@
 notification really occurs on a separate thread.
 
 """
+import threading
 import time
 
-import six.moves as sm
-
 from traits.api import Float, HasTraits
 from traits.testing.unittest_tools import unittest
 
@@ -27,7 +26,7 @@ def test_notification_on_separate_thread(self):
         notifications = []
 
         def on_foo_notifications(obj, name, old, new):
-            thread_id = sm._thread.get_ident()
+            thread_id = threading.current_thread().ident
             event = (thread_id, obj, name, old, new)
             notifications.append(event)
 
@@ -41,7 +40,7 @@ def on_foo_notifications(obj, name, old, new):
         self.assertEqual(len(notifications), 1)
         self.assertEqual(notifications[0][1:], (obj, 'foo', 0, 3))
 
-        this_thread_id = sm._thread.get_ident()
+        this_thread_id = threading.current_thread().ident
         self.assertNotEqual(this_thread_id, notifications[0][0])
 
 

traits/tests/test_trait_change_event_tracer.py

@@ -1,7 +1,5 @@
 """ Tests for the trait change event tracer. """
 
-import six
-
 from traits.api import Float, HasTraits, on_trait_change
 from traits.testing.unittest_tools import unittest