Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (236869 => 236870)
--- trunk/Source/_javascript_Core/ChangeLog 2018-10-05 07:49:56 UTC (rev 236869)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-10-05 10:56:31 UTC (rev 236870)
@@ -1,3 +1,16 @@
+2018-10-05 Mike Gorse <[email protected]>
+
+ [GTK] build fails with python 3 if LANG and LC_TYPE are unset
+ https://bugs.webkit.org/show_bug.cgi?id=190258
+
+ Reviewed by Konstantin Tokarev.
+
+ * Scripts/cssmin.py: Set stdout to UTF-8 on python 3.
+ * Scripts/generateIntlCanonicalizeLanguage.py: Open files with
+ encoding=UTF-8 on Python 3.
+ * yarr/generateYarrCanonicalizeUnicode: Ditto.
+ * yarr/generateYarrUnicodePropertyTables.py: Ditto.
+
2018-10-04 Mark Lam <[email protected]>
Move start/EndOfFixedExecutableMemoryPool pointers into the FixedVMPoolExecutableAllocator object.
Modified: trunk/Source/_javascript_Core/Scripts/cssmin.py (236869 => 236870)
--- trunk/Source/_javascript_Core/Scripts/cssmin.py 2018-10-05 07:49:56 UTC (rev 236869)
+++ trunk/Source/_javascript_Core/Scripts/cssmin.py 2018-10-05 10:56:31 UTC (rev 236870)
@@ -43,7 +43,10 @@
if __name__ == "__main__":
import sys
- if sys.version_info[0] == 3 and sys.stdin.encoding != 'UTF-8':
+ if sys.version_info[0] >= 3:
import io
- sys.stdin = io.TextIOWrapper(sys.stdin.buffer, encoding='UTF-8')
+ if sys.stdin.encoding != 'UTF-8':
+ sys.stdin = io.TextIOWrapper(sys.stdin.buffer, encoding='UTF-8')
+ if sys.stdout.encoding != 'UTF-8':
+ sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='UTF-8')
sys.stdout.write(cssminify(sys.stdin.read()))
Modified: trunk/Source/_javascript_Core/Scripts/generateIntlCanonicalizeLanguage.py (236869 => 236870)
--- trunk/Source/_javascript_Core/Scripts/generateIntlCanonicalizeLanguage.py 2018-10-05 07:49:56 UTC (rev 236869)
+++ trunk/Source/_javascript_Core/Scripts/generateIntlCanonicalizeLanguage.py 2018-10-05 10:56:31 UTC (rev 236870)
@@ -44,7 +44,10 @@
def openOrExit(path, mode):
try:
- return open(path, mode)
+ if sys.version_info.major >= 3:
+ return open(path, mode, encoding="UTF-8")
+ else:
+ return open(path, mode)
except IOError as e:
print("I/O error opening {0}, ({1}): {2}".format(path, e.errno, e.strerror))
exit(1)
Modified: trunk/Source/_javascript_Core/yarr/generateYarrCanonicalizeUnicode (236869 => 236870)
--- trunk/Source/_javascript_Core/yarr/generateYarrCanonicalizeUnicode 2018-10-05 07:49:56 UTC (rev 236869)
+++ trunk/Source/_javascript_Core/yarr/generateYarrCanonicalizeUnicode 2018-10-05 10:56:31 UTC (rev 236870)
@@ -77,7 +77,10 @@
dirname = os.path.dirname(path)
if not os.path.isdir(dirname):
os.makedirs(dirname)
- return open(path, mode)
+ if sys.version_info.major >= 3:
+ return open(path, mode, encoding="UTF-8")
+ else:
+ return open(path, mode)
except IOError as e:
print("I/O error opening {0}, ({1}): {2}".format(path, e.errno, e.strerror))
exit(1)
Modified: trunk/Source/_javascript_Core/yarr/generateYarrUnicodePropertyTables.py (236869 => 236870)
--- trunk/Source/_javascript_Core/yarr/generateYarrUnicodePropertyTables.py 2018-10-05 07:49:56 UTC (rev 236869)
+++ trunk/Source/_javascript_Core/yarr/generateYarrUnicodePropertyTables.py 2018-10-05 10:56:31 UTC (rev 236870)
@@ -90,7 +90,10 @@
def openOrExit(path, mode):
try:
- return open(path, mode)
+ if sys.version_info.major >= 3:
+ return open(path, mode, encoding="UTF-8")
+ else:
+ return open(path, mode)
except IOError as e:
print("I/O error opening {0}, ({1}): {2}".format(path, e.errno, e.strerror))
exit(1)
