From e85cf827a804d9abf4cbf48af6394c49331de322 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Mon, 21 Sep 2015 22:55:55 +0800 Subject: Revert "Merge tag 'upstream/2.9.1+dfsg1'" This reverts commit 21ee18bdbc9a9d4500e12a1399d51c593b8b31d4, reversing changes made to de338c1adfa336ddb5177ceb5c63bcd868a0ebc7. --- python/drv_libxml2.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'python/drv_libxml2.py') diff --git a/python/drv_libxml2.py b/python/drv_libxml2.py index e43fb1d..c2ec3e2 100644 --- a/python/drv_libxml2.py +++ b/python/drv_libxml2.py @@ -34,12 +34,18 @@ 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_info[0] < 3: + __author__ = codecs.unicode_escape_decode(__author__)[0] + + StringTypes = (str, unicode) +else: + StringTypes = str from xml.sax._exceptions import * from xml.sax import xmlreader, saxutils @@ -65,9 +71,9 @@ def _d(s): try: import libxml2 -except ImportError, e: +except ImportError: raise SAXReaderNotAvailable("libxml2 not available: " \ - "import error was: %s" % e) + "import error was: %s" % sys.exc_info()[1]) class Locator(xmlreader.Locator): """SAX Locator adapter for libxml2.xmlTextReaderLocator""" @@ -134,7 +140,7 @@ class LibXml2Reader(xmlreader.XMLReader): self.__parsing = 1 try: # prepare source and create reader - if type(source) in StringTypes: + if isinstance(source, StringTypes): reader = libxml2.newTextReaderFilename(source) else: source = saxutils.prepare_input_source(source) -- cgit v1.2.3