diff -r b0996e4a289e -r 1d8dd9706f46 E4XML/XMLHandlerBase.py
--- a/E4XML/XMLHandlerBase.py Fri Jan 01 16:11:36 2010 +0000
+++ b/E4XML/XMLHandlerBase.py Sat Jan 02 15:11:35 2010 +0000
@@ -8,11 +8,8 @@
"""
import sys
-from types import UnicodeType
-try:
- import cPickle as pickle
-except ImportError:
- import pickle
+##from types import UnicodeType
+import pickle as pickle
from xml.sax.handler import ContentHandler
@@ -45,8 +42,8 @@
self.stack = []
self._marker = '__MARKER__'
- self.NEWPARA = unichr(0x2029)
- self.NEWLINE = unichr(0x2028)
+ self.NEWPARA = chr(0x2029)
+ self.NEWLINE = chr(0x2028)
def utf8_to_code(self, text):
"""
@@ -54,8 +51,9 @@
@param text the text to encode (string)
"""
- if type(text) is not UnicodeType:
- text = unicode(text, "utf-8")
+ # TODO: convert calls to this method to not use it anymore
+## if not isinstance(text, UnicodeType):
+## text = str(text, "utf-8")
return text
def unescape(self, text, attribute = False):
@@ -158,7 +156,7 @@
"""
Handler method for the "long" end tag.
"""
- self.stack.append(long(self.buffer.strip()))
+ self.stack.append(int(self.buffer.strip()))
def endBool(self):
"""
@@ -193,7 +191,7 @@
"""
Handler method for the "unicode" end tag.
"""
- u = unicode(self.utf8_to_code(self.unescape(self.buffer)))
+ u = str(self.utf8_to_code(self.unescape(self.buffer)))
self.stack.append(u)
def startList(self, attrs):
