merged fixes from 0.8

src/python/dm/common/objects/dmObject.py

@@ -82,12 +82,12 @@ class DmObject(UserDict.UserDict):
         for key in displayKeyList:
             value = self.get(key)
             if isinstance(value, DmObject):
-                dictRep[key] = value.getDictRep('__all__')
+                dictRep[key] = value.getDictRep('ALL')
             elif type(value) == types.ListType:
                 itemList = []
                 for item in value:
                     if isinstance(item, DmObject):
-                        itemList.append(item.getDictRep('__all__'))
+                        itemList.append(item.getDictRep('ALL'))
                     else:
                         itemList.append(item)
                 dictRep[key] = itemList
@@ -157,6 +157,6 @@ if __name__ == '__main__':
     x2 = DmObject.fromJsonString(j)
     print 'DM Object 2: ', x2
     print 'Type of DM object 2: ', type(x2)
-    print x2.getDisplayString(displayKeyList='__all__')
+    print x2.getDisplayString(displayKeyList='ALL')
 
 

src/python/dm/common/service/dmController.py

@@ -84,7 +84,7 @@ class DmController(object):
     def listToJson(cls, dmObjectList):
         jsonList = []
         for dmObject in dmObjectList:
-            jsonList.append(dmObject.getDictRep(keyList='__all__'))
+            jsonList.append(dmObject.getDictRep(keyList='ALL'))
         return json.dumps(jsonList)
 
     @classmethod