components/python/setuptools-git/patches/01.nonascii.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 13 Apr 2017 13:20:29 -0700
changeset 7864 f11e8d81786a
parent 6232 42781cd5b9bd
permissions -rw-r--r--
PSARC 2017/057 pcre2 25783625 Add pcre2 10.23 to Userland because vte 0.47.90 requires it
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6232
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
Changes needed to get all the tests to work with both Python 2.X and 3.X.
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
This patch was developed in-house; it should be sent upstream.
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
--- setuptools-git-1.1/setuptools_git/tests.py.~1~	2014-08-16 02:06:54.000000000 -0700
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
+++ setuptools-git-1.1/setuptools_git/tests.py	2016-06-16 11:12:06.864751220 -0700
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
@@ -78,7 +78,10 @@
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
                      posix(realpath('subdir/entry.txt'))]))
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
 
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
     def test_nonascii_filename(self):
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
-        filename = 'héhé.html'
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
+        if sys.version_info >= (3,):
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
+            filename = 'héhé.html'.encode('utf-8')
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
+        else:
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
+            filename = 'héhé.html'
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
 
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
         # HFS Plus uses decomposed UTF-8
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
         if sys.platform == 'darwin':
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
@@ -88,11 +91,11 @@
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    20
 
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    21
         self.assertEqual(
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    22
                 [fn for fn in os.listdir(self.directory) if fn[0] != '.'],
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    23
-                [filename])
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    24
+                [fsdecode(filename)])
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    25
 
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    26
         self.assertEqual(
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    27
                 set(self.gitlsfiles(self.directory)),
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    28
-                set([posix(realpath(filename))]))
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    29
+                set([posix(realpath(fsdecode(filename)))]))
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    30
 
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    31
     def test_utf8_filename(self):
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    32
         if sys.version_info >= (3,):
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    33
@@ -220,7 +223,10 @@
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    34
                 set(['entry.txt']))
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    35
 
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    36
     def test_nonascii_filename(self):
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    37
-        filename = 'héhé.html'
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    38
+        if sys.version_info >= (3,):
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    39
+            filename = 'héhé.html'.encode('utf-8')
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    40
+        else:
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    41
+            filename = 'héhé.html'
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    42
 
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    43
         # HFS Plus uses decomposed UTF-8
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    44
         if sys.platform == 'darwin':
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    45
@@ -230,11 +236,11 @@
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    46
 
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    47
         self.assertEqual(
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    48
                 [fn for fn in os.listdir(self.directory) if fn[0] != '.'],
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    49
-                [filename])
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    50
+                [fsdecode(filename)])
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    51
 
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    52
         self.assertEqual(
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    53
                 set(self.listfiles(self.directory)),
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    54
-                set([filename]))
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    55
+                set([fsdecode(filename)]))
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    56
 
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    57
     def test_utf8_filename(self):
42781cd5b9bd 23209234 Upgrade setuptools-git to 1.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    58
         if sys.version_info >= (3,):