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

Solved PyXML SAX1 vs. SAX2 problem?

Browse Source 
svn: r194
This commit is contained in:
Don Allingham 2001-06-28 15:24:51 +00:00
parent 62d712dfcf
commit 794ea65fa4
1 changed files with 12 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
gramps/src/ReadXML.py
View File

@ -31,13 +31,6 @@ import os
from gnome.ui import * from gnome.ui import *
import sys import sys
try:
import _xmlplus.sax
import _xmlplus.sax.saxutils
except:
import xml.sax
import xml.sax.saxutils
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -45,21 +38,10 @@ except:
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
if sys.version[0] != '1': try:
sax = 2 from xml.sax import make_parser, SAXParseException
try: except:
from _xmlplus.sax import make_parser, SAXParseException from _xmlplus.sax import make_parser, SAXParseException
except:
from xml.sax import make_parser, SAXParseException
else:
try:
from xml.sax.saxexts import make_parser
from xml.sax import SAXParseException
from xml.sax.saxutils import ErrorRaiser
sax = 1
except:
from xml.sax import make_parser, SAXParseException
sax = 2
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -74,14 +56,8 @@ def importData(database, filename, callback):
database.pmap = {} database.pmap = {}
database.fmap = {} database.fmap = {}
if sax == 1: parser = make_parser()
parser = make_parser() parser.setContentHandler(GrampsImportParser(database,callback,basefile))
parser.setDocumentHandler(GrampsImportParser(database,callback,basefile))
parser.setErrorHandler(ErrorRaiser())
else:
parser = make_parser()
parser.setContentHandler(GrampsImportParser(database,callback,basefile))
try: try:
xml_file = gzip.open(filename,"rb") xml_file = gzip.open(filename,"rb")
@ -93,11 +69,8 @@ def importData(database, filename, callback):
return 0 return 0
try: try:
if sax == 1: parser.parse(xml_file)
parser.parseFile(xml_file) except SAXParseException:
else:
parser.parse(xml_file)
except xml.sax.SAXParseException:
GnomeErrorDialog(_("%s is a corrupt file") % filename) GnomeErrorDialog(_("%s is a corrupt file") % filename)
import traceback import traceback
traceback.print_exc() traceback.print_exc()
@ -130,13 +103,8 @@ def loadData(database, filename, callback):
filename = os.path.normpath(filename) filename = os.path.normpath(filename)
if sax == 1: parser = make_parser()
parser = make_parser() parser.setContentHandler(GrampsParser(database,callback,basefile))
parser.setDocumentHandler(GrampsParser(database,callback,basefile))
parser.setErrorHandler(ErrorRaiser())
else:
parser = make_parser()
parser.setContentHandler(GrampsParser(database,callback,basefile))
try: try:
xml_file = gzip.open(filename,"rb") xml_file = gzip.open(filename,"rb")
@ -148,11 +116,8 @@ def loadData(database, filename, callback):
return 0 return 0
try: try:
if sax == 1: parser.parse(xml_file)
parser.parseFile(xml_file) except SAXParseException:
else:
parser.parse(xml_file)
except xml.sax.SAXParseException:
GnomeErrorDialog(_("%s is a corrupt file") % filename) GnomeErrorDialog(_("%s is a corrupt file") % filename)
import traceback import traceback
traceback.print_exc() traceback.print_exc()