From 927faac6113b625a9a3423eef8f144fc7d9a8547 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Wed, 10 Jul 2013 23:00:54 -0400 Subject: [PATCH] python: fix drv_libxml2.py for python3 compatibility https://bugzilla.gnome.org/show_bug.cgi?id=703979 --- python/drv_libxml2.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/python/drv_libxml2.py b/python/drv_libxml2.py index e43fb1d..c9075e6 100644 --- a/python/drv_libxml2.py +++ b/python/drv_libxml2.py @@ -34,12 +34,20 @@ TODO """ -__author__ = u"Stéphane Bidoul " +__author__ = "Stéphane Bidoul " __version__ = "0.3" +import sys import codecs -from types import StringType, UnicodeType -StringTypes = (StringType,UnicodeType) + +if sys.version < "3": + __author__ = codecs.unicode_escape_decode(__author__)[0] + + from types import StringType, UnicodeType + StringTypes = (StringType,UnicodeType) + +else: + StringTypes = (str) from xml.sax._exceptions import * from xml.sax import xmlreader, saxutils @@ -65,7 +73,7 @@ def _d(s): try: import libxml2 -except ImportError, e: +except ImportError as e: raise SAXReaderNotAvailable("libxml2 not available: " \ "import error was: %s" % e) -- 1.8.3.2