Commits

ms2ger committed ea62532

Don't use unicode and basestring in python 3.

Comments (0)

Files changed (1)

anolislib/utils.py

 
 from html5lib.constants import spaceCharacters
 
+if sys.version_info[0] == 3:
+    str_type = str
+    unicode_type = str
+else:
+    str_type = basestring
+    unicode_type = unicode
+
 ids = {}
 
 spaceCharacters = u"".join(spaceCharacters)
         node.getparent().remove(node)
     
     # Then just use tostring
-    return etree.tostring(Element, encoding=unicode, method='text',
+    return etree.tostring(Element, encoding=unicode_type, method='text',
                           with_tail=False)
 
 
 
 def copyContentForRemoval(node, text=True, children=True, tail=True):
     # Preserve the text, if it is an element
-    if isinstance(node.tag, basestring) and node.text is not None and text:
+    if isinstance(node.tag, str_type) and node.text is not None and text:
         if node.getprevious() is not None:
             if node.getprevious().tail is None:
                 node.getprevious().tail = node.text
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.