File remove_six.patch of Package python-PyICU

Overview Repositories Revisions Requests Users Attributes Meta

File remove_six.patch of Package python-PyICU (Revision f509a946b00dd1538a84129f6dd29e96)

Currently displaying revision f509a946b00dd1538a84129f6dd29e96 , Show latest

--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-
 import os, sys
 
 try:
@@ -195,7 +194,7 @@ else:
     except:
         if not _cflags:
             raise RuntimeError('''
-Please install pkg-config on your system or set the PYICU_CFLAGS environment 
+Please install pkg-config on your system or set the PYICU_CFLAGS environment
 variable to the flags required by the C++ compiler to find the header files
 for ICU, and possibly -std=c++11 if using ICU version >= 60
             ''')
@@ -234,7 +233,7 @@ else:
 Please install pkg-config on your system or set the PYICU_LFLAGS environment
 variable to the flags required by the linker to find the libraries for ICU
             ''')
-      
+
 
 if 'PYICU_LIBRARIES' in os.environ:
     _libraries = os.environ['PYICU_LIBRARIES'].split(os.pathsep)
@@ -283,4 +282,4 @@ setup(name="PyICU",
                              libraries=_libraries)],
       package_dir={"": "py"},
       packages=['icu'],
-      tests_require=['pytest', 'six'])
+      tests_require=['pytest'])
--- a/test/test_BytesTrie.py
+++ b/test/test_BytesTrie.py
@@ -21,7 +21,7 @@
 # DEALINGS IN THE SOFTWARE.
 # ====================================================================
 
-import sys, os, six
+import sys, os
 
 from unittest import TestCase, main
 from icu import *
--- a/test/test_Charset.py
+++ b/test/test_Charset.py
@@ -21,7 +21,7 @@
 # ====================================================================
 #
 
-import sys, os, six
+import sys, os
 
 from unittest import TestCase, main
 from icu import *
@@ -59,7 +59,7 @@ class TestCharset(TestCase):
     def testUnicode(self):
 
         bytes = u'beaut\xe9 probable'.encode('iso-8859-1')
-        ustring = six.text_type(CharsetDetector(bytes).detect())
+        ustring = str(CharsetDetector(bytes).detect())
 
         self.assertTrue(ustring.encode('iso-8859-1') == bytes)
 
--- a/test/test_Collator.py
+++ b/test/test_Collator.py
@@ -21,7 +21,7 @@
 # ====================================================================
 #
 
-import sys, os, six
+import sys, os
 
 from unittest import TestCase, main
 from icu import *
@@ -44,7 +44,7 @@ class TestCollator(TestCase):
 
         collator = Collator.createInstance(Locale.getFrance())
         input = open(self.filePath('noms.txt'), 'rb')
-        names = [six.text_type(n.strip(), 'utf-8') for n in input.readlines()]
+        names = [str(n.strip(), 'utf-8') for n in input.readlines()]
         input.close()
         ecole = names[0]
 
--- a/test/test_LayoutEngine.py
+++ b/test/test_LayoutEngine.py
@@ -22,7 +22,7 @@
 # ====================================================================
 #
 
-import sys, os, six
+import sys, os
 
 from unittest import TestCase, main
 from icu import *
--- a/test/test_Locale.py
+++ b/test/test_Locale.py
@@ -21,7 +21,7 @@
 # DEALINGS IN THE SOFTWARE.
 # ====================================================================
 
-import sys, os, six
+import sys, os
 
 from unittest import TestCase, main
 from icu import *
--- a/test/test_LocaleData.py
+++ b/test/test_LocaleData.py
@@ -22,7 +22,7 @@
 #
 # This is a python translation of ICU's LocaleDataTest.java
 
-import sys, os, six
+import sys, os
 
 from unittest import TestCase, main
 from icu import *
@@ -110,8 +110,8 @@ class TestLocaleData(TestCase):
                                     break
                     if existsInScript == False:
                         print_output("ExemplarSet containment failed for locale : "+ locale)
-            print_output(locale + " exemplar " + repr(six.text_type(exemplarSets[0])))
-            print_output(locale + " exemplar(case-folded) " + repr(six.text_type(exemplarSets[1])))
+            print_output(locale + " exemplar " + repr(str(exemplarSets[0])))
+            print_output(locale + " exemplar(case-folded) " + repr(str(exemplarSets[1])))
             self.assertTrue(locale + " case-folded is a superset", exemplarSets[1].containsAll(exemplarSets[0]))
             if (exemplarSets[1] == exemplarSets[0]):
                 ++equalCount
@@ -156,10 +156,10 @@ class TestLocaleData(TestCase):
                             if existsInScript == False and h == 0:
                                 print_output("ExemplarSet containment failed for locale,option,type : " \
                                       + locale + "," + str(option) + "," + str(esType))
-            print_output(locale + " exemplar(ES_STANDARD)" + repr(six.text_type(exemplarSets[0])))
-            print_output(locale + " exemplar(ES_AUXILIARY)" + repr(six.text_type(exemplarSets[1])))
-            print_output(locale + " exemplar(case-folded,ES_STANDARD)" + repr(six.text_type(exemplarSets[2])))
-            print_output(locale + " exemplar(case-folded,ES_AUXILIARY)" + repr(six.text_type(exemplarSets[3])))
+            print_output(locale + " exemplar(ES_STANDARD)" + repr(str(exemplarSets[0])))
+            print_output(locale + " exemplar(ES_AUXILIARY)" + repr(str(exemplarSets[1])))
+            print_output(locale + " exemplar(case-folded,ES_STANDARD)" + repr(str(exemplarSets[2])))
+            print_output(locale + " exemplar(case-folded,ES_AUXILIARY)" + repr(str(exemplarSets[3])))
             self.assertTrue(locale + " case-folded is a superset", exemplarSets[2].containsAll(exemplarSets[0]))
             self.assertTrue(locale + " case-folder is a superset", exemplarSets[3].containsAll(exemplarSets[1]))
             if (exemplarSets[2] == exemplarSets[0]):
--- a/test/test_LocaleMatcher.py
+++ b/test/test_LocaleMatcher.py
@@ -21,7 +21,7 @@
 # DEALINGS IN THE SOFTWARE.
 # ====================================================================
 
-import sys, os, six
+import sys, os
 
 from unittest import TestCase, main, SkipTest
 from icu import *
--- a/test/test_PythonReplaceable.py
+++ b/test/test_PythonReplaceable.py
@@ -21,7 +21,7 @@
 # DEALINGS IN THE SOFTWARE.
 # ====================================================================
 
-import sys, os, six
+import sys, os
 
 from unittest import TestCase, main
 from icu import *
--- a/test/test_Script.py
+++ b/test/test_Script.py
@@ -21,7 +21,7 @@
 # ====================================================================
 #
 
-import sys, os, six
+import sys, os
 
 from unittest import TestCase, main
 from icu import *
@@ -53,7 +53,7 @@ class TestScript(TestCase):
 
         # iterating codepoints not UChar
         names = [Script.getScript(cp).getShortName()
-                 for cp in six.text_type(pairs)]
+                 for cp in str(pairs)]
         if unicode_32bit:
             self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names)
         else:
@@ -83,10 +83,10 @@ class TestScript(TestCase):
             self.assertEqual(str(u), char)
         elif is_unicode_32bit():
             self.assertEqual(len(char), 1)
-            self.assertEqual(six.text_type(u), char)
+            self.assertEqual(str(u), char)
         else:
             self.assertEqual(len(char), 2)
-            self.assertEqual(six.text_type(u), char)
+            self.assertEqual(str(u), char)
 
 if __name__ == "__main__":
     main()
--- a/test/test_TimeZone.py
+++ b/test/test_TimeZone.py
@@ -21,7 +21,7 @@
 # ====================================================================
 #
 
-import sys, os, six, datetime
+import sys, os, datetime
 
 from unittest import TestCase, main
 from icu import *
--- a/test/test_Transliterator.py
+++ b/test/test_Transliterator.py
@@ -22,7 +22,7 @@
 # ====================================================================
 #
 
-import sys, os, six
+import sys, os
 
 from unittest import TestCase, main
 from icu import *
@@ -50,7 +50,7 @@ class TestTransliterator(TestCase):
         string = UnicodeString("Shang4hai3 zi4lai2shui3 lai2 zi4 hai3 shang4")
         result = u'Sh\xe0ngh\u01cei z\xecl\xe1ishu\u01d0 l\xe1i z\xec h\u01cei sh\xe0ng'
 
-        self.assertTrue(trans.transliterate(six.text_type(string)) == result)
+        self.assertTrue(trans.transliterate(str(string)) == result)
         self.assertTrue(trans.transliterate(string) == result)
         self.assertTrue(string == result)
 
--- a/test/test_UCharsTrie.py
+++ b/test/test_UCharsTrie.py
@@ -21,7 +21,7 @@
 # DEALINGS IN THE SOFTWARE.
 # ====================================================================
 
-import sys, os, six
+import sys, os
 
 from unittest import TestCase, main
 from icu import *

Places

File remove_six.patch of Package python-PyICU (Revision f509a946b00dd1538a84129f6dd29e96)

Places