Revision c9e32b8be95671340643c2e77a19af544af73266 authored by Ryan Lovelett on 12 January 2016, 22:07:27 UTC, committed by Ryan Lovelett on 13 January 2016, 01:56:33 UTC
Python 3 on Linux reads the system locale information to determine what
it should use as the default encoding for strings read from files (this
is different from OS X which is always UTF-8 by default [1]).

Since all the Swift gyb templates are UTF-8 encoded there is effectively
no reason to parse them as anything else. This patch forces the gyb
template parser to read the template using UTF-8 encoding. It accounts
for both reading and writing to a file as well as reading from stdin and
writing to stdout.

Two changes of note are that it now includes a __future__ import that
should make Python 2 behave a little closer to Python 3 in terms of
unicode support. Additionally Python 2 can no longer use cStringIO
because it does not support unicode [2].

To test this patch I ran these commands before and after the patch.
Note: that before the patch if the locale was set to something other
than UTF-8, ASCII for instance, the Python 3 runs would fail. See [3]
for example failure message.

Without stdin/stdout:

$ python2 utils/gyb -o Arrays.2.7.swift stdlib/public/core/Arrays.swift.gyb
$ python3 utils/gyb -o Arrays.3.5.swift stdlib/public/core/Arrays.swift.gyb
$ diff -u Arrays.2.7.swift Arrays.3.5.swift

With stdin/stdout:

$ cat stdlib/public/core/Arrays.swift.gyb | python2 utils/gyb > Arrays.2.7.stdin.stdout.swift
$ cat stdlib/public/core/Arrays.swift.gyb | python3 utils/gyb > Arrays.3.5.stdin.stdout.swift
$ diff -u Arrays.2.7.stdin.stdout.swift Arrays.3.5.stdin.stdout.swift

[1] https://docs.python.org/3/howto/unicode.html#unicode-filenames
[2] https://docs.python.org/2/library/stringio.html#cStringIO.StringIO
[3] https://lists.swift.org/pipermail/swift-dev/Week-of-Mon-20160111/000780.html
1 parent 7026909
History
File Mode Size
Inputs
index.swift -rw-r--r-- 2.8 KB
index.swift.response -rw-r--r-- 39.3 KB
index_bad_modulename.swift -rw-r--r-- 366 bytes
index_bad_modulename.swift.response -rw-r--r-- 1.5 KB
index_big_array.swift -rw-r--r-- 164 bytes
index_big_array.swift.response -rw-r--r-- 1014 bytes
index_forbid_typecheck.swift -rw-r--r-- 297 bytes
index_forbid_typecheck.swift.response -rw-r--r-- 1.9 KB
index_implicit_vis.swift -rw-r--r-- 498 bytes
index_module_cycle.swift -rw-r--r-- 433 bytes
index_module_missing_depend.swift -rw-r--r-- 448 bytes
index_swift_lib.swift -rw-r--r-- 659 bytes
index_with_clang_module.swift -rw-r--r-- 884 bytes
index_with_swift_module.swift -rw-r--r-- 909 bytes
rdar_21602898.swift -rw-r--r-- 215 bytes
rdar_21602898.swift.response -rw-r--r-- 570 bytes

back to top