Task #8887: fix for python 2.6 compatibility issues

LCS/PyCommon/util.py

@@ -138,9 +138,18 @@ def humanreadablesize(num, suffix='B', base=1000):
         return str(num)
 
 def convertIntKeysToString(dct):
-    '''recusrsively convert all int keys in a dict to string'''
-    return {str(k): convertIntKeysToString(v) if isinstance(v, dict) else v for k,v in dct.items()}
+    '''recursively convert all int keys in a dict to string'''
+
+    #python2.7 using dict comprehension
+    #return {str(k): convertIntKeysToString(v) if isinstance(v, dict) else v for k,v in dct.items()}
+
+    #python2.6 using dict constructor and list comprehension
+    return dict((str(k), convertIntKeysToString(v) if isinstance(v, dict) else v) for k,v in dct.items())
 
 def convertStringDigitKeysToInt(dct):
-    '''recusrsively convert all string keys which are a digit in a dict to int'''
-    return {int(k) if isinstance(k, basestring) and k.isdigit() else k : convertStringDigitKeysToInt(v) if isinstance(v, dict) else v for k,v in dct.items()}
+    '''recursively convert all string keys which are a digit in a dict to int'''
+    #python2.7 using dict comprehension
+    #return {int(k) if isinstance(k, basestring) and k.isdigit() else k : convertStringDigitKeysToInt(v) if isinstance(v, dict) else v for k,v in dct.items()}
+
+    #python2.6 using dict constructor and list comprehension
+    return dict((int(k) if isinstance(k, basestring) and k.isdigit() else k, convertStringDigitKeysToInt(v) if isinstance(v, dict) else v) for k,v in dct.items())