]> SALOME platform Git repositories - tools/medcoupling.git/commitdiff
Salome HOME
[PY3] Suite suppression six ngr/python3_dev
authorGilles DAVID <gilles-g.david@edf.fr>
Thu, 20 Apr 2017 09:22:18 +0000 (11:22 +0200)
committerGilles DAVID <gilles-g.david@edf.fr>
Thu, 20 Apr 2017 09:22:18 +0000 (11:22 +0200)
src/MEDCoupling_Swig/MEDCouplingBasicsTest3.py
src/MEDCoupling_Swig/MEDCouplingBasicsTest4.py
src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py

index e715b39ed294126baf2a345c5fa5d53cca5bd13b..a7339779569c6a660294ba412b667efc902e3854 100644 (file)
@@ -32,8 +32,6 @@ from math import pi,e,sqrt,cos,sin
 from datetime import datetime
 from MEDCouplingDataForTest import MEDCouplingDataForTest
 import rlcompleter,readline # this line has to be here, to ensure a usability of MEDCoupling/MEDLoader. B4 removing it please notify to anthony.geay@cea.fr
-import six
-from six.moves import range
 
 class MEDCouplingBasicsTest3(unittest.TestCase):
     def testSwigGetItem1(self):
@@ -502,7 +500,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase):
         it2=da2.__iter__()
         i=0
         for it in da:
-            pt = six.next(it2)
+            pt = next(it2)
             it[:]=pt
             pass
         self.assertTrue(da.isEqual(da2))
@@ -560,7 +558,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase):
         it2=da2.__iter__()
         i=0
         for it in da:
-            pt = six.next(it2)
+            pt = next(it2)
             it[:]=pt
             pass
         self.assertTrue(da.isEqual(da2,1e-12))
index a9203fc5231eaa6ab565ba40026c62b1713cc71d..f02d3579a3584a58aadbda4438a9e9bfc45384e6 100644 (file)
@@ -28,7 +28,6 @@ from datetime import datetime
 from MEDCouplingDataForTest import MEDCouplingDataForTest
 import rlcompleter,readline # this line has to be here, to ensure a usability of MEDCoupling/MEDLoader. B4 removing it please notify to anthony.geay@cea.fr
 from sys import platform
-from six.moves import range
 
 def checkFreeMemory(size):
     """
index 17d82d5d962c6e12cc98dba255b862f92438d20c..c4f19205381e12627609f7b2a42dcdac8363cf64 100644 (file)
@@ -32,8 +32,6 @@ from math import pi,e,sqrt,cos,sin
 from datetime import datetime
 from MEDCouplingDataForTest import MEDCouplingDataForTest
 import rlcompleter,readline # this line has to be here, to ensure a usability of MEDCoupling/MEDLoader. B4 removing it please notify to anthony.geay@cea.fr
-import six
-from six.moves import range
 
 class MEDCouplingBasicsTest5(unittest.TestCase):
     def testSwig2FieldDoubleBuildSubPartRange1(self):
@@ -2330,34 +2328,34 @@ class MEDCouplingBasicsTest5(unittest.TestCase):
     def testSwigBugOnUnpackingTuplesInDataArray1(self):
         inp=DataArrayDouble([(1,2,3),(4,5,6),(7,8,9),(10,11,12)])
         it=inp.__iter__()
-        r = six.next(it)
+        r = next(it)
         self.assertRaises(StopIteration,r.__getitem__,4)
         self.assertEqual(len(r),3)
         a,b,c=r
-        r = six.next(it)
+        r = next(it)
         self.assertEqual(len(r),3)
         d,e,f=r
-        r = six.next(it)
+        r = next(it)
         self.assertEqual(len(r),3)
         g,h,i=r
-        r = six.next(it)
+        r = next(it)
         self.assertEqual(len(r),3)
         j,k,l=r
         self.assertTrue(inp.isEqual(DataArrayDouble([a,b,c,d,e,f,g,h,i,j,k,l],4,3),1e-12))
         ########
         inp=DataArrayInt([(1,2,3),(4,5,6),(7,8,9),(10,11,12)])
         it=inp.__iter__()
-        r = six.next(it)
+        r = next(it)
         self.assertRaises(StopIteration,r.__getitem__,4)
         self.assertEqual(len(r),3)
         a,b,c=r
-        r = six.next(it)
+        r = next(it)
         self.assertEqual(len(r),3)
         d,e,f=r
-        r = six.next(it)
+        r = next(it)
         self.assertEqual(len(r),3)
         g,h,i=r
-        r = six.next(it)
+        r = next(it)
         self.assertEqual(len(r),3)
         j,k,l=r
         self.assertTrue(inp.isEqual(DataArrayInt([a,b,c,d,e,f,g,h,i,j,k,l],4,3)))