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

6462: GEDCOM import fails (patch by Enno Borgsteede)

Browse Source 
svn: r22001
This commit is contained in:
Paul Franklin 2013-04-15 22:01:08 +00:00
parent 16cfc2af23
commit 706e92be77
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps/plugins/lib/libgedcom.py
View File

@ -1237,7 +1237,7 @@ class UTF8Reader(BaseReader):
def reset(self): def reset(self):
self.ifile.seek(0) self.ifile.seek(0)
data = self.ifile.read(3) data = self.ifile.read(3)
if data != "\xef\xbb\xbf": if data != b"\xef\xbb\xbf":
self.ifile.seek(0) self.ifile.seek(0)
def readline(self): def readline(self):
@ -7490,17 +7490,17 @@ class GedcomStageOne(object):
package. package.
""" """
line = input_file.read(2) line = input_file.read(2)
if line == "\xef\xbb": if line == b"\xef\xbb":
input_file.read(1) input_file.read(1)
self.enc = "UTF8" self.enc = "UTF8"
return input_file return input_file
elif line == "\xff\xfe": elif line == b"\xff\xfe":
self.enc = "UTF16" self.enc = "UTF16"
input_file.seek(0) input_file.seek(0)
return codecs.EncodedFile(input_file, 'utf8', 'utf16') return codecs.EncodedFile(input_file, 'utf8', 'utf16')
elif not line : elif not line :
raise GedcomError(self.__EMPTY_GED) raise GedcomError(self.__EMPTY_GED)
elif line[0] == "\x00" or line[1] == "\x00": elif line[0] == b"\x00" or line[1] == b"\x00":
raise GedcomError(self.__BAD_UTF16) raise GedcomError(self.__BAD_UTF16)
else: else:
input_file.seek(0) input_file.seek(0)