From 830b2e44b0c6b307318605d37d3cdf107b094444 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Sun, 31 Jan 2016 01:18:24 +0000
Subject: [PATCH] switched __all__ to ALL for objects
---
src/python/dm/common/objects/dmObject.py | 6 +++---
src/python/dm/common/service/dmController.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/python/dm/common/objects/dmObject.py b/src/python/dm/common/objects/dmObject.py
index 5ac3c400..6cbc6ab4 100755
--- a/src/python/dm/common/objects/dmObject.py
+++ b/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')
diff --git a/src/python/dm/common/service/dmController.py b/src/python/dm/common/service/dmController.py
index f65d9b27..1e5b5976 100755
--- a/src/python/dm/common/service/dmController.py
+++ b/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
--
GitLab