clean up

Author: ejacox

src/bd2k/util/hashes.py

@@ -126,8 +126,8 @@ def _hash_hashable( hash_obj, items ):
     hash_obj.update( '}' )
 
 
-def _hash_hashable_item( hash_obj, xxx_todo_changeme ):
-    (k, v) = xxx_todo_changeme
+def _hash_hashable_item( hash_obj, k_v ):
+    (k, v) = k_v
     if isinstance( k, basestring ):
         hash_obj.update( k )
         hash_obj.update( ':' )

src/bd2k/util/xml/builder.py

@@ -68,9 +68,9 @@ def callable(f):
     basestring = str
 
 try:
-    str
+    unicode
 except NameError:
-    str = str
+    unicode = str
 
 
 class ElementMaker(object):
@@ -183,8 +183,8 @@ def add_cdata(elem, cdata):
 
         if str not in typemap:
             typemap[str] = add_text
-        if str not in typemap:
-            typemap[str] = add_text
+        if unicode not in typemap:
+            typemap[unicode] = add_text
         # if ET.CDATA not in typemap:
         #     typemap[ET.CDATA] = add_cdata