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

Remove buggy _xmlplus imports

Browse Source 
It hasn't been maintained upstream for years and isn't in
most operating systems anymore (any?).

https://gramps-project.org/bugs/view.php?id=6947#c31672

provides a link to this:

http://fedoraproject.org/wiki/Features/RemovePyXML#Detailed_Description

I don't think it belongs in gramps.
This commit is contained in:
Paul Franklin
2016-06-10 14:21:58 -07:00
parent cf8a6390ca
commit 6ee612109c
6 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gramps/gen/plug/_options.py
View File

@@ -39,12 +39,8 @@ import sys
# SAX interface
#
#-------------------------------------------------------------------------
try:
from xml.sax import make_parser, handler, SAXParseException
from xml.sax.saxutils import quoteattr
except:
from _xmlplus.sax import make_parser, handler, SAXParseException
from _xmlplus.sax.saxutils import quoteattr
from xml.sax import make_parser, handler, SAXParseException
from xml.sax.saxutils import quoteattr
#-------------------------------------------------------------------------
#

5
gramps/gen/plug/docgen/stylesheet.py
View File

@@ -60,10 +60,7 @@ log = logging.getLogger(".stylesheet")
# SAX interface
#
#-------------------------------------------------------------------------
try:
from xml.sax import make_parser, handler, SAXParseException
except ImportError:
from _xmlplus.sax import make_parser, handler, SAXParseException
from xml.sax import make_parser, handler, SAXParseException
#------------------------------------------------------------------------
#

8
gramps/gen/plug/report/_book.py
View File

@@ -47,12 +47,8 @@ import os
# SAX interface
#
#-------------------------------------------------------------------------
try:
from xml.sax import make_parser, handler, SAXParseException
from xml.sax.saxutils import escape
except:
from _xmlplus.sax import make_parser, handler, SAXParseException
from _xmlplus.sax.saxutils import escape
from xml.sax import make_parser, handler, SAXParseException
from xml.sax.saxutils import escape
#-------------------------------------------------------------------------
#

5
gramps/gen/plug/report/_options.py
View File

@@ -44,10 +44,7 @@ def escxml(word):
# SAX interface
#
#-------------------------------------------------------------------------
try:
from xml.sax import make_parser, SAXParseException
except:
from _xmlplus.sax import make_parser, SAXParseException
from xml.sax import make_parser, SAXParseException
#-------------------------------------------------------------------------
#

5
gramps/gen/plug/report/_paper.py
View File

@@ -40,10 +40,7 @@ from ...const import PAPERSIZE
# Try to abstract SAX1 from SAX2
#
#-------------------------------------------------------------------------
try:
from xml.sax import make_parser, handler, SAXParseException
except:
from _xmlplus.sax import make_parser, handler, SAXParseException
from xml.sax import make_parser, handler, SAXParseException
#-------------------------------------------------------------------------
#

5
gramps/gui/aboutdialog.py
View File

@@ -31,10 +31,7 @@ import sys
##import logging
##_LOG = logging.getLogger(".GrampsAboutDialog")
try:
from xml.sax import make_parser, handler, SAXParseException
except ImportError:
from _xmlplus.sax import make_parser, handler, SAXParseException
from xml.sax import make_parser, handler, SAXParseException
#-------------------------------------------------------------------------
#