From fd0eba9bacbe586004aeb131427178bc550cca06 Mon Sep 17 00:00:00 2001 From: Filipp Lepalaan Date: Mon, 2 Apr 2018 14:47:38 +0300 Subject: Better Python 3 support --- gsxws/objectify.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gsxws/objectify.py') diff --git a/gsxws/objectify.py b/gsxws/objectify.py index 7803f43..dfcae79 100644 --- a/gsxws/objectify.py +++ b/gsxws/objectify.py @@ -112,7 +112,7 @@ class GsxElement(objectify.ObjectifiedElement): # Work around lxml chomping leading zeros off of IMEI numbers if name in STRING_TYPES: - return unicode(result.text or '') + return str(result.text or '') if isinstance(result, objectify.NumberElement): return result.pyval @@ -120,7 +120,7 @@ class GsxElement(objectify.ObjectifiedElement): if isinstance(result, objectify.StringElement): name = result.tag result = result.text or '' - result = unicode(result) + result = str(result) if not result: return @@ -157,10 +157,10 @@ def parse(root, response): lookup = objectify.ObjectifyElementClassLookup(tree_class=GsxElement) parser.set_element_class_lookup(lookup) - if isinstance(root, basestring) and os.path.exists(root): + if isinstance(root, str) and os.path.exists(root): root = objectify.parse(root, parser) else: - root = objectify.fromstring(root, parser) + root = objectify.fromstring(root.encode(), parser) return root.find('*//%s' % response) -- cgit v1.2.3