From 8b1c368513bf442eac100f79827bb77918e55ac7 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Tue, 12 Jun 2001 17:04:03 +0000 Subject: [PATCH] EncodedFile no longer used svn: r116 --- gramps/src/ReadXML.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gramps/src/ReadXML.py b/gramps/src/ReadXML.py index f35ee4e40..2e23f1578 100644 --- a/gramps/src/ReadXML.py +++ b/gramps/src/ReadXML.py @@ -67,7 +67,6 @@ def importData(database, filename, callback): parser = xml.sax.make_parser() parser.setContentHandler(GrampsParser(database,callback,basefile,1)) xml_file = gzip.open(filename,"rb") -# xml_file = EncodedFile(gzip.open(filename,"rb"),'utf-8','latin-1') parser.parse(xml_file) xml_file.close() @@ -96,10 +95,7 @@ def loadData(database, filename, callback): parser.setContentHandler(GrampsParser(database,callback,basefile,0)) try: - if sax == 1: - xml_file = gzip.open(filename,"rb") - else: - xml_file = EncodedFile(gzip.open(filename,"rb"),'utf-8','latin-1') + xml_file = gzip.open(filename,"rb") except IOError,msg: GnomeErrorDialog(_("%s could not be opened\n") % filename + str(msg)) return 0