Merge pull request #1045 from enthought/remove-python-version-checks

Remove sys.version_info checks

Author: aaronayres35

integrationtests/mayavi/common.py

@@ -529,10 +529,7 @@ def run_standalone(self):
         g.start_event_loop()
         if self.exception_info is not None:
             type, value, tb = self.exception_info
-            if sys.version_info[0] > 2:
-                raise type(value).with_traceback(tb)
-            else:
-                raise type(value)
+            raise type(value).with_traceback(tb)
 
     def run(self):
         """This starts everything up and runs the test.  Call main to

mayavi/sources/vtk_data_source.py

@@ -164,20 +164,14 @@ def __get_pure_state__(self):
         data = self.data
         if data is not None:
             sdata = write_dataset_to_string(data)
-            if sys.version_info[0] > 2:
-                z = gzip_string(sdata.encode('ascii'))
-            else:
-                z = gzip_string(sdata)
+            z = gzip_string(sdata.encode('ascii'))
             d['data'] = z
         return d
 
     def __set_pure_state__(self, state):
         z = state.data
         if z is not None:
-            if sys.version_info[0] > 2:
-                d = gunzip_string(z).decode('ascii')
-            else:
-                d = gunzip_string(z)
+            d = gunzip_string(z).decode('ascii')
             r = tvtk.DataSetReader(read_from_input_string=1,
                                    input_string=d)
             warn = r.global_warning_display

mayavi/tools/camera.py

@@ -24,12 +24,6 @@
 from .engine_manager import get_engine
 
 
-if sys.version_info[0] > 2:
-    string_types = (str,)
-else:
-    string_types = (basestring,)
-
-
 def world_to_display(x, y, z, figure=None):
     """ Converts 3D world coordinates to screenshot pixel coordinates.
 
@@ -285,14 +279,14 @@ def view(azimuth=None, elevation=None, distance=None, focalpoint=None,
     # bounds.
     bounds = np.array(ren.compute_visible_prop_bounds())
     if distance is not None and not (
-            isinstance(distance, string_types) and distance == 'auto'):
+            isinstance(distance, str) and distance == 'auto'):
         r = distance
     else:
         r = max(bounds[1::2] - bounds[::2]) * 2.0
 
     cen = (bounds[1::2] + bounds[::2]) * 0.5
     if focalpoint is not None and not (
-            isinstance(focalpoint, string_types) and focalpoint == 'auto'):
+            isinstance(focalpoint, str) and focalpoint == 'auto'):
         cen = np.asarray(focalpoint)
 
     # Find camera position.

tvtk/array_handler.py

@@ -50,9 +50,6 @@
 
 BASE_REFERENCE_COUNT = vtk.vtkObject().GetReferenceCount()
 
-if sys.version_info[0] > 2:
-    unicode = str
-
 
 def getbuffer(array):
     return getattr(numpy, 'getbuffer', memoryview)(array)
@@ -713,7 +710,7 @@ def convert_array(arr, vtk_typ=None):
 
 def is_array_sig(s):
     """Given a signature, return if the signature has an array."""
-    if not isinstance(s, (unicode, str)):
+    if not isinstance(s, str):
         return False
     arr_types = ['Array', 'vtkPoints', 'vtkIdList']
     for i in arr_types:

tvtk/class_tree.py

@@ -10,10 +10,7 @@
 
 import sys
 
-if sys.version_info[0] > 2:
-    import builtins
-else:
-    import __builtin__ as builtins
+import builtins
 
 
 class TreeNode:

tvtk/code_gen.py

@@ -220,10 +220,7 @@ def _write_wrapper_class(self, node, tvtk_name):
         # The only reason this method is separate is to generate code
         # for an individual class when debugging.
         fname = camel2enthought(tvtk_name) + '.py'
-        if sys.version_info[0] > 2:
-            out = open(os.path.join(self.out_dir, fname), 'w', encoding='utf-8')
-        else:
-            out = open(os.path.join(self.out_dir, fname), 'w')
+        out = open(os.path.join(self.out_dir, fname), 'w', encoding='utf-8')
         self.wrap_gen.generate_code(node, out)
         out.close()
 

tvtk/tests/test_class_tree.py

@@ -3,23 +3,17 @@
 # Copyright (c) 2004, Enthought, Inc.
 
 """Tests class_tree.py.  Uses the vtk module to test the code.  Also
-tests if the tree generation works for the __builtin__ module.
+tests if the tree generation works for the builtins module.
 
 """
-
+import builtins
 import sys
 import unittest
 from contextlib import contextmanager
 
 from tvtk import class_tree
 
 import vtk
-if sys.version_info[0] > 2:
-    import builtins as __builtin__
-    PY_VER = 3
-else:
-    import __builtin__
-    PY_VER = 2
 
 # This computation can be expensive, so we cache it.
 _cache = class_tree.ClassTree(vtk)
@@ -42,14 +36,14 @@ def setUp(self):
     @contextmanager
     def _remove_loader_from_builtin(self):
         self._loader = None
-        if hasattr(__builtin__, '__loader__'):
-            self._loader = __builtin__.__loader__
-            del __builtin__.__loader__
+        if hasattr(builtins, '__loader__'):
+            self._loader = builtins.__loader__
+            del builtins.__loader__
         try:
             yield
         finally:
             if self._loader:
-                __builtin__.__loader__ = self._loader
+                builtins.__loader__ = self._loader
 
     def test_basic_vtk(self):
         """Basic tests for the VTK module."""
@@ -76,16 +70,11 @@ def test_basic_vtk(self):
                 expect = ['object', 'vtkColor3', 'vtkColor4', 'vtkDenseArray',
                           'vtkQuaternion', 'vtkRect',
                           'vtkSparseArray', 'vtkTuple',
-                          'vtkTypedArray', 'vtkVariantStrictWeakOrderKey',
-                          'vtkVector', 'vtkVector2', 'vtkVector3']
-                if PY_VER == 3:
-                    expect.remove('vtkVariantStrictWeakOrderKey')
+                          'vtkTypedArray','vtkVector',
+                          'vtkVector2', 'vtkVector3']
             else:
                 self.assertGreaterEqual(vtk_major_version, 8)
-                if PY_VER == 3:
-                    expect = ['object']
-                else:
-                    expect = ['object', 'vtkVariantStrictWeakOrderKey']
+                expect = ['object']
             self.assertEqual(names, expect)
         elif (hasattr(vtk, 'vtkVector')):
             self.assertEqual(len(t.tree[0]), 11)
@@ -133,9 +122,9 @@ def _get_ancestors(klass):
                 bases.extend(_get_ancestors(base))
             return bases
 
-        # Simple __builtin__ test.
+        # Simple builtins test.
         with self._remove_loader_from_builtin():
-            t = class_tree.ClassTree(__builtin__)
+            t = class_tree.ClassTree(builtins)
             t.create()
             n = t.get_node('TabError')
             bases = [x.__name__ for x in _get_ancestors(TabError)]
@@ -176,12 +165,12 @@ def test_tree(self):
                 self.assertEqual(n.level, level)
 
     def test_builtin(self):
-        """Check if tree structure for __builtin__ works."""
+        """Check if tree structure for builtins works."""
 
         # This tests to see if the tree structure generation works for
-        # the __builtin__ module.
+        # the builtins module.
         with self._remove_loader_from_builtin():
-            t = class_tree.ClassTree(__builtin__)
+            t = class_tree.ClassTree(builtins)
             t.create()
             self.t = t
             self.test_parent_child()

tvtk/tests/test_tvtk.py

@@ -44,10 +44,6 @@
 # Only used for testing.
 from tvtk.tvtk_classes import tvtk_helper
 
-PY_VER = sys.version_info[0]
-if PY_VER > 2:
-    long = int
-
 
 def mysum(arr):
     val = arr
@@ -134,10 +130,7 @@ def f(self):
         r = tvtk.XMLDataReader()
         self.assertEqual(r.f(), 'f')
         if len(vtk.vtkObjectBase.__bases__) > 0:
-            if vtk_major_version == 7 and PY_VER < 3:
-                expect = ()
-            else:
-                expect = (object,)
+            expect = (object,)
         else:
             expect = tuple()
 
@@ -337,19 +330,14 @@ def test_property(self):
         self.assertEqual(p.color, (0.5, 0.5, 0.5))
 
     def test_points_lookup(self):
-        """ Test if points can be looked up with both int and long keys.
-            Fixes GH Issue 173.
+        """ Test if points can be looked up.
         """
         points = tvtk.Points()
         points.insert_next_point((0, 1, 2))
         pt = points[0]
         self.assertEqual(pt, (0, 1, 2))
-        ptl = points[long(0)]
-        self.assertEqual(ptl, (0, 1, 2))
         get_pt = points.get_point(0)
         self.assertEqual(get_pt, (0, 1, 2))
-        get_ptl = points.get_point(long(0))
-        self.assertEqual(get_ptl, (0, 1, 2))
 
     def test_cell_array(self):
         """ Test if cell array insertion updates number of cells.
@@ -503,13 +491,7 @@ def test_idlist(self):
             self.assertEqual(i, j)
         self.assertEqual(f[-1], 3)
         self.assertEqual(f[0], 0)
-        if sys.version_info[0] > 2:
-            self.assertEqual(repr(f), '[0, 1, 2, 3]')
-        else:
-            if type(f[0]) is long:
-                self.assertEqual(repr(f), '[0L, 1L, 2L, 3L]')
-            else:
-                self.assertEqual(repr(f), '[0, 1, 2, 3]')
+        self.assertEqual(repr(f), '[0, 1, 2, 3]')
         f.append(4)
         f.extend([5, 6])
         self.assertEqual(len(f), 7)
@@ -1053,12 +1035,6 @@ def test_import_tvtk_does_not_import_gui(self):
         self.assertFalse('QtCore' in output)
         self.assertFalse('wx' in output)
 
-    @unittest.skipIf(PY_VER > 2, "Irrelevant for python 3")
-    def test_unicode_traits(self):
-        reader = tvtk.DelimitedTextReader()
-        self.assertIsInstance(reader.unicode_record_delimiters, unicode)
-        self.assertIsInstance(reader.unicode_string_delimiters, unicode)
-        self.assertIsInstance(reader.unicode_field_delimiters, unicode)
 
 if __name__ == "__main__":
     unittest.main()

tvtk/util/qt_gradient_editor.py

@@ -19,7 +19,6 @@
     ColorControlPoint, ChannelBase, FunctionControl, GradientEditorWidget
 )
 
-PY3 = sys.version_info[0] > 2
 
 ##########################################################################
 # `QGradientControl` class.
@@ -163,17 +162,12 @@ def __init__(self, master=None, gradient_table=None, color_space=None,
         set_status_text: a callback used to set the status text
              when using the editor.
         """
-        if PY3:
-            kw = dict(
-                master=master, gradient_table=gradient_table,
-                color_space=color_space, width=width,
-                height=height
-            )
-            super().__init__(**kw)
-        else:
-            FunctionControl.__init__(self, master, gradient_table, color_space,
-                                     width, height)
-            QtGui.QWidget.__init__(self, parent=master)
+        kw = dict(
+            master=master, gradient_table=gradient_table,
+            color_space=color_space, width=width,
+            height=height
+        )
+        super().__init__(**kw)
         self.resize(width, height)
         self.setMinimumSize(100, 50)
 
@@ -303,15 +297,10 @@ def __init__(self, master, vtk_table, on_change_color_table=None,
                  'h', 's', 'v', 'r', 'g', 'b', 'a' separately
                  specified creates different panels for each.
         """
-        if PY3:
-            kw = dict(master=master, vtk_table=vtk_table,
-                      on_change_color_table=on_change_color_table,
-                      colors=colors)
-            super().__init__(**kw)
-        else:
-            QtGui.QWidget.__init__(self, master)
-            GradientEditorWidget.__init__(self, master, vtk_table,
-                                          on_change_color_table, colors)
+        kw = dict(master=master, vtk_table=vtk_table,
+                    on_change_color_table=on_change_color_table,
+                    colors=colors)
+        super().__init__(**kw)
 
         gradient_preview_width = self.gradient_preview_width
         gradient_preview_height = self.gradient_preview_height

tvtk/wrapper_gen.py

@@ -30,8 +30,6 @@
 else:
     faulthandler.enable()
 
-PY_VER = sys.version_info[0]
-
 
 def get_trait_def(value, **kwargs):
     """ Return the appropriate trait type, reformatted string and
@@ -78,10 +76,6 @@ def get_trait_def(value, **kwargs):
     number_map = {int: 'traits.Int',
                   float: 'traits.Float'}
 
-    # In Python 2 there is long type
-    if PY_VER < 3:
-        number_map[long] = 'traits.Int'
-
     if type_ in number_map:
         return number_map[type_], str(value), kwargs_code
 
@@ -90,11 +84,6 @@ def get_trait_def(value, **kwargs):
             value = ''
         return 'traits.String', '{!r}'.format(value), kwargs_code
 
-    elif PY_VER < 3 and type_ is unicode:
-        if value == u'\x00':
-            value = u''
-        return 'traits.Unicode', '{!r}'.format(value), kwargs_code
-
     elif type_ in (tuple, list):
         shape = (len(value),)
         dtypes = set(type(element) for element in value)