summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2017-05-09 18:17:29 -0700
committerChun-wei Fan <fanchunwei@src.gnome.org>2017-05-09 18:43:24 -0700
commit9c4776803bf3564c1cb18dc995a3d0dafaf14343 (patch)
treea90b81d3c73872547e640673d129721f833610c4
parent9ad72875e9f08e4c519ef63d44cdbd94aa9504f7 (diff)
downloadlibcroco-9c4776803bf3564c1cb18dc995a3d0dafaf14343.tar.gz
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
-rw-r--r--win32/replace.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/win32/replace.py b/win32/replace.py
index 0cb269a..3aeceb1 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())