diff options
| author | Christian Heimes <christian@cheimes.de> | 2013-11-23 21:14:01 +0100 |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2013-11-23 21:14:01 +0100 |
| commit | 310e4c43cd87df44b170acf43f63cb94d00321c5 (patch) | |
| tree | a0f7a9343a149ed2d0709f7f463e33903f6f56d5 /Tools/iobench/iobench.py | |
| parent | e8b1ba1699d429b1e80ea7d31032628d09c3e43e (diff) | |
| parent | dd52c5a1c46b4d8e42e5e7a00f9b307f113de08d (diff) | |
| download | cpython-git-310e4c43cd87df44b170acf43f63cb94d00321c5.tar.gz | |
merge
Diffstat (limited to 'Tools/iobench/iobench.py')
| -rw-r--r-- | Tools/iobench/iobench.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Tools/iobench/iobench.py b/Tools/iobench/iobench.py index 530bc79d5c..712e58472e 100644 --- a/Tools/iobench/iobench.py +++ b/Tools/iobench/iobench.py @@ -24,6 +24,8 @@ def text_open(fn, mode, encoding=None): try: return open(fn, mode, encoding=encoding or TEXT_ENCODING) except TypeError: + if 'r' in mode: + mode += 'U' # 'U' mode is needed only in Python 2.x return open(fn, mode) def get_file_sizes(): @@ -380,7 +382,7 @@ def prepare_files(): f.write(os.urandom(size)) # Text files chunk = [] - with text_open(__file__, "rU", encoding='utf8') as f: + with text_open(__file__, "r", encoding='utf8') as f: for line in f: if line.startswith("# <iobench text chunk marker>"): break |