Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug #6255. Do not use TextIOWrapper when running python2.

Browse Source 
svn: r21200
This commit is contained in:
Gary Burton 2013-01-22 20:54:34 +00:00
parent d91be2fd0b
commit c36181d024
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gramps/plugins/importer/importxml.py
View File

@ -371,16 +371,21 @@ class LineParser(object):
try:
if use_gzip:
import io
# Bug 6255. TextIOWrapper is required for python3 to present
# file contents as text, otherwise they are read
# as binary. However due to a missing method (read1)
# in early python3 versions this try block will fail
# It should work correctly from version 3.3
# Gramps will still import XML files using python
# versions < 3.3.0 but the file progress meter will
# not work properly, going immediately to 100%.
ofile = io.TextIOWrapper(gzip.open(filename, "rb"))
if sys.version_info[0] == 2:
ofile = gzip.open(filename, "rb")
else:
import io
# Bug 6255. TextIOWrapper is required for python3 to
# present file contents as text, otherwise they
# are read as binary. However due to a missing
# method (read1) in early python3 versions this
# try block will fail.
# Gramps will still import XML files using python
# versions < 3.3.0 but the file progress meter
# will not work properly, going immediately to
# 100%.
# It should work correctly from version 3.3.
ofile = io.TextIOWrapper(gzip.open(filename, "rb"))
else:
ofile = open(filename, "r")