From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed, 10 May 2017 01:17:29 +0000 (-0700)
Subject: win32/replace.py: Fix replacing items in files with UTF-8 content
X-Git-Tag: upstream/2.28.1~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e106b75b25c332cc55f7fad83a7e7ff124309b18;hp=c56660441e778a31e80271095deb4c89a74afd76;p=platform%2Fupstream%2Fatk.git

win32/replace.py: Fix replacing items in files with UTF-8 content

Some files that this script will process might have UTF-8 items in
there, which can cause problems on Python 3.x as it is more strict and
careful on unicode issues.  Fix this by:

-Doing what we did before on Python 2.x
-Opening the file with encoding='utf-8' on Python 3.x
---

diff --git a/win32/replace.py b/win32/replace.py
index a81bab9..f215cce 100644
--- a/win32/replace.py
+++ b/win32/replace.py
@@ -21,9 +21,15 @@ valid_actions = ['remove-prefix',
                  'replace-str',
                  'remove-str']
 
+def open_file(filename, mode):
+    if sys.version_info[0] < 3:
+        return open(filename, mode=mode)
+    else:
+        return open(filename, mode=mode, encoding='utf-8')
+
 def replace_multi(src, dest, replace_items):
-    with open(src, 'r') as s:
-        with open(dest, 'w') as d:
+    with open_file(src, 'r') as s:
+        with open_file(dest, 'w') as d:
             for line in s:
                 replace_dict = dict((re.escape(key), value) \
                                for key, value in replace_items.items())