Attachment 134698 Details for Bug 103120 – patch to python scripts

[patch] patch to python scripts

poppler-0.60.1-python3-20171006-061934.pat (text/plain), 3.41 KB, created by William Bader on 2017-10-06 05:31:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William Bader

Created: 2017-10-06 05:31:05 UTC

Size: 3.41 KB

patch

obsolete

> gtkdoc.py                     | 19 +++++++++++++------
> poppler/gen-unicode-tables.py | 29 ++++++++++++++++++-----------
> 2 files changed, 31 insertions(+), 17 deletions(-)
>
>diff --git a/gtkdoc.py b/gtkdoc.py
>index 48f862a..5440e28 100644
>--- a/gtkdoc.py
>+++ b/gtkdoc.py
>@@ -21,6 +21,7 @@ import os.path
> import subprocess
> import sys
> 
>+PY2 = sys.version_info[0] == 2
> 
> class GTKDoc(object):
> 
>@@ -194,14 +195,20 @@ class GTKDoc(object):
> 
>         if print_output:
>             if stdout:
>-                try:
>-                    sys.stdout.write(stdout.encode("utf-8"))
>-                except UnicodeDecodeError:
>+                if PY2:
>+                    try:
>+                        sys.stdout.write(stdout.encode("utf-8"))
>+                    except UnicodeDecodeError:
>+                        sys.stdout.write(stdout)
>+                else:
>                     sys.stdout.write(stdout)
>             if stderr:
>-                try:
>-                    sys.stderr.write(stderr.encode("utf-8"))
>-                except UnicodeDecodeError:
>+                if PY2:
>+                    try:
>+                        sys.stderr.write(stderr.encode("utf-8"))
>+                    except UnicodeDecodeError:
>+                        sys.stderr.write(stderr)
>+                else:
>                     sys.stderr.write(stderr)
> 
>         if process.returncode != 0:
>diff --git a/poppler/gen-unicode-tables.py b/poppler/gen-unicode-tables.py
>index 282f6e5..3505ad3 100644
>--- a/poppler/gen-unicode-tables.py
>+++ b/poppler/gen-unicode-tables.py
>@@ -1,27 +1,34 @@
>+import unicodedata
>+import sys
>+
>+PY2 = sys.version_info[0] == 2
>+if not PY2:
>+  unichr = chr
>+  xrange = range
>+
> UNICODE_LAST_CHAR_PART1 = 0x2FAFF
> HANGUL_S_BASE = 0xAC00
> HANGUL_S_COUNT = 19 * 21 * 28
>-import unicodedata
> 
>-print """// Generated by gen-unicode-tables.py
>+print("""// Generated by gen-unicode-tables.py
> 
> typedef struct {
>   Unicode character;
>   int length;
>   int offset;
> } decomposition;
>-"""
>+""")
> 
> decomp_table = []
> max_index = 0
> decomp_expansion_index = {}
> decomp_expansion = []
> for u in xrange(0, UNICODE_LAST_CHAR_PART1):
>-	if (u >= HANGUL_S_BASE and u < HANGUL_S_BASE + HANGUL_S_COUNT):
>+	if u >= HANGUL_S_BASE and u < HANGUL_S_BASE + HANGUL_S_COUNT:
> 		continue
> 	norm = tuple(map(ord, unicodedata.normalize("NFKD", unichr(u))))
> 	if norm != (u,):
>-		try: 
>+		try:
> 			i = decomp_expansion_index[norm]
> 			decomp_table.append((u, len(norm), i))
> 		except KeyError:
>@@ -29,10 +36,10 @@ for u in xrange(0, UNICODE_LAST_CHAR_PART1):
> 			decomp_expansion_index[norm] = max_index
> 			decomp_expansion.append((norm, max_index))
> 			max_index += len(norm)
>-print "#define DECOMP_TABLE_LENGTH %d\n" % len(decomp_table)
>-print "static const decomposition decomp_table[] = {\n%s\n};\n" % ", \n".join(
>+print("#define DECOMP_TABLE_LENGTH %d\n" % len(decomp_table))
>+print("static const decomposition decomp_table[] = {\n%s\n};\n" % ", \n".join(
> 		"  { 0x%x, %d, %d }" % (character, length, offset)
>-		for character, length, offset in decomp_table)
>-print "static const Unicode decomp_expansion[] = {\n%s\n};\n" % ", \n".join(
>-		"  %s /* offset %d */ " % (", ".join("0x%x" % u for u in norm), 
>-			index) for norm, index in decomp_expansion)
>+		for character, length, offset in decomp_table))
>+print("static const Unicode decomp_expansion[] = {\n%s\n};\n" % ", \n".join(
>+		"  %s /* offset %d */ " % (", ".join("0x%x" % u for u in norm),
>+			index) for norm, index in decomp_expansion))

Actions: View | Splinter Review

Attachments on bug 103120: 134698

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.