[roottest] Remove code for testing with Python 2

Python 2 is not supported anymore for some time already.

Author: guitargeek

roottest/python/basic/PyROOT_basictests.py

@@ -369,11 +369,8 @@ def make_obj_str(s):
       l.sort()
       self.assertEqual( list(l), ['2', '4', '5', '6', '8', 'a', 'b', 'i', 'j'] )
 
-      if sys.hexversion >= 0x3000000:
-         l.sort( key=TObjString.GetName )
-         l.reverse()
-      else:
-         l.sort( lambda a, b: cmp(b.GetName(),a.GetName()) )
+      l.sort( key=TObjString.GetName )
+      l.reverse()
       self.assertEqual( list(l), ['j', 'i', 'b', 'a', '8', '6', '5', '4', '2'] )
 
       l2 = l[:3]
@@ -387,15 +384,11 @@ def make_obj_str(s):
       l3 = l[6:8]
       self.assertEqual( list(l2+l3), ['j', 'i', 'b', '5', '4'] )
 
-      if sys.hexversion >= 0x3000000:
-         next = '__next__'
-      else:
-         next = 'next'
       i = iter(l2)
-      self.assertEqual( getattr( i, next )(), 'j' )
-      self.assertEqual( getattr( i, next )(), 'i' )
-      self.assertEqual( getattr( i, next )(), 'b' )
-      self.assertRaises( StopIteration, getattr( i, next ) )
+      self.assertEqual( getattr( i, "__next__" )(), 'j' )
+      self.assertEqual( getattr( i, "__next__" )(), 'i' )
+      self.assertEqual( getattr( i, "__next__" )(), 'b' )
+      self.assertRaises( StopIteration, getattr( i, "__next__" ) )
 
    def test3TVector( self ):
       """Test TVector2/3/T behavior"""

roottest/python/cling/force_flush.py

@@ -1,9 +1,4 @@
 from __future__ import print_function
 
-import sys
-
 def print_flushed(*args):
-   if sys.hexversion < 0x3000000:
-      return print(*args)
-   else:
-      return print(*args, flush=True)
+   return print(*args, flush=True)

roottest/python/common.py

@@ -9,26 +9,19 @@
 import pytest
 
 
-if sys.hexversion >= 0x3000000:
-   pylong = int
-   maxvalue = sys.maxsize
-
-   class MyTestCase( unittest.TestCase ):
-      def shortDescription( self ):
-         desc = str(self)
-         doc_first_line = None
-
-         if self._testMethodDoc:
-            doc_first_line = self._testMethodDoc.split("\n")[0].strip()
-         if doc_first_line:
-            desc = doc_first_line
-         return desc
-else:
-   pylong = long
-   maxvalue = sys.maxint
-
-   class MyTestCase( unittest.TestCase ):
-      pass
+pylong = int
+maxvalue = sys.maxsize
+
+class MyTestCase( unittest.TestCase ):
+   def shortDescription( self ):
+      desc = str(self)
+      doc_first_line = None
+
+      if self._testMethodDoc:
+         doc_first_line = self._testMethodDoc.split("\n")[0].strip()
+      if doc_first_line:
+         desc = doc_first_line
+      return desc
 
 FIXCLING = '--fixcling' in sys.argv
 if 'FIXCLING' in os.environ:

roottest/python/cpp/PyROOT_advancedtests.py

@@ -387,16 +387,14 @@ def test2PassBuiltinsByNonConstRef( self ):
       SetDoubleThroughRef = ROOT.SetDoubleThroughRef
       SetIntThroughRef = ROOT.SetIntThroughRef
 
-      if sys.hexversion >= 0x2050000:
-         import ctypes
-         l = ctypes.c_long(42)
-         SetLongThroughRef( l, 41 )
-         self.assertEqual( l.value, 41 )
-
-      if sys.hexversion >= 0x2050000:
-         i = ctypes.c_int(42)
-         SetIntThroughRef( i, 13 )
-         self.assertEqual( i.value, 13 )
+      import ctypes
+      l = ctypes.c_long(42)
+      SetLongThroughRef( l, 41 )
+      self.assertEqual( l.value, 41 )
+
+      i = ctypes.c_int(42)
+      SetIntThroughRef( i, 13 )
+      self.assertEqual( i.value, 13 )
 
    def test3PassBuiltinsByNonConstRef( self ):
       """Test parameter passing of builtins through const reference"""

roottest/python/memory/PyROOT_memorytests.py

@@ -19,20 +19,16 @@
    'Memory1TestCase'
 ]
 
-if sys.hexversion >= 0x3000000:
-   class MyTestCase( unittest.TestCase ):
-      def shortDescription( self ):
-         desc = str(self)
-         doc_first_line = None
-
-         if self._testMethodDoc:
-            doc_first_line = self._testMethodDoc.split("\n")[0].strip()
-         if doc_first_line:
-            desc = doc_first_line
-         return desc
-else:
-   class MyTestCase( unittest.TestCase ):
-      pass
+class MyTestCase( unittest.TestCase ):
+   def shortDescription( self ):
+      desc = str(self)
+      doc_first_line = None
+
+      if self._testMethodDoc:
+         doc_first_line = self._testMethodDoc.split("\n")[0].strip()
+      if doc_first_line:
+         desc = doc_first_line
+      return desc
 
 
 ### Memory management test cases =============================================

roottest/python/pickle/common.py

@@ -3,7 +3,7 @@
 # Created: 04/16/08
 # Last: 09/24/10
 
-import sys, unittest
+import unittest
 
 pclfn     = "PyROOT_test.pcl"
 cpclfn    = "PyROOT_test.cpcl"
@@ -18,17 +18,13 @@
 Nvec      = 12
 Mvec      =  7
 
-if sys.hexversion >= 0x3000000:
-   class MyTestCase( unittest.TestCase ):
-      def shortDescription( self ):
-         desc = str(self)
-         doc_first_line = None
+class MyTestCase( unittest.TestCase ):
+   def shortDescription( self ):
+      desc = str(self)
+      doc_first_line = None
 
-         if self._testMethodDoc:
-            doc_first_line = self._testMethodDoc.split("\n")[0].strip()
-         if doc_first_line:
-            desc = doc_first_line
-         return desc
-else:
-   class MyTestCase( unittest.TestCase ):
-      pass
+      if self._testMethodDoc:
+         doc_first_line = self._testMethodDoc.split("\n")[0].strip()
+      if doc_first_line:
+         desc = doc_first_line
+      return desc

roottest/python/regression/Amir.py

@@ -1,12 +1,4 @@
-import sys
-
-# Note: ROOT does not support import * for Python 3.x
-# More info at https://sft.its.cern.ch/jira/browse/ROOT-8931
-
-if sys.hexversion >= 0x3000000:
-   from ROOT import TChain
-else:
-   from ROOT import *
+from ROOT import TChain
 
 class TestTChain:
    def __init__( self ):

roottest/python/regression/PyROOT_regressiontests.py

@@ -180,11 +180,6 @@ def test2ImportStyles( self ):
       if self.hasThread == self.noThread:
          cmd += " - -b"
 
-      # Do not test 'from ROOT import *' on Python 3.x, since it's not supported
-      if sys.hexversion < 0x300000:
-         stat, out = commands.getstatusoutput( cmd % "from ROOT import *" )
-         self.assertEqual( WEXITSTATUS(stat), self.hasThread )
-
       stat, out = commands.getstatusoutput( cmd % "from ROOT import gROOT" )
       self.assertEqual( WEXITSTATUS(stat), self.noThread )
 
@@ -218,20 +213,6 @@ def test3SettingOfBatchMode( self ):
          cmd % 'from ROOT import PyConfig; PyConfig.StartGuiThread = 1; from ROOT import gDebug;' )
       self.assertEqual( WEXITSTATUS(stat), self.hasThread )
 
-      # Do not test 'from ROOT import *' on Python 3.x, since it's not supported
-      if sys.hexversion < 0x300000:
-         stat, out = commands.getstatusoutput( (cmd % 'from ROOT import *;') + ' - -b' )
-         self.assertEqual( WEXITSTATUS(stat), self.noThread )
-
-         stat, out = commands.getstatusoutput(
-            cmd % 'from ROOT import gROOT; gROOT.SetBatch( 1 ); from ROOT import *;' )
-         self.assertEqual( WEXITSTATUS(stat), self.noThread )
-
-         if not gROOT.IsBatch():               # can't test if no display ...
-            stat, out = commands.getstatusoutput(
-               cmd % 'from ROOT import gROOT; gROOT.SetBatch( 0 ); from ROOT import *;' )
-            self.assertEqual( WEXITSTATUS(stat), self.hasThread )
-
       # Restore the cleaned LD_PRELOAD for other tests
       if cleaned_preload is not None:
          os.environ['LD_PRELOAD'] = cleaned_preload

roottest/python/stl/PyROOT_stltests.py

@@ -410,12 +410,9 @@ def __run_tests(self, container):
         b1, e1 = container.begin(), container.end()
         b2, e2 = container.begin(), container.end()
 
-        if sys.hexversion >= 0x3000000:
-           def pr_cmp(a, b):
-              if a == b: return 0
-              return 1
-        else:
-           pr_cmp = cmp
+        def pr_cmp(a, b):
+           if a == b: return 0
+           return 1
 
         assert b1.__eq__(b2)
         assert not b1.__ne__(b2)