deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-10 06:33:34 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Improve Unicode handling when reading files. (#329)

Browse Source
This commit is contained in:
Ross Scroggs
2016-11-13 10:02:00 -08:00
committed by Jay Lee
parent e10e63a87f
commit fc5cd1c219
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gam.py
View File

@ -611,9 +611,10 @@ def readFile(filename, mode=u'rb', continueOnError=False, displayError=True, enc
return f.read()
with codecs.open(os.path.expanduser(filename), mode, encoding) as f:
content = f.read()
# codecs does not strip UTF-8 BOM (ef:bb:bf) so we must
if not content.startswith(codecs.BOM_UTF8):
return content
return content.replace(codecs.BOM_UTF8, u'', 1)
return content[3:]
return unicode(sys.stdin.read())
except IOError as e:
if continueOnError:
@ -621,7 +622,7 @@ def readFile(filename, mode=u'rb', continueOnError=False, displayError=True, enc
stderrWarningMsg(e)
return None
systemErrorExit(6, e)
except LookupError as e:
except (LookupError, UnicodeDecodeError, UnicodeError) as e:
print u'ERROR: %s' % e
sys.exit(2)
#