dabo Commit
Revision 6254
Date: 2010-12-17 13:17:57 -0800 (Fri, 17 Dec 2010)
Author: Jacekk
Trac: http://trac.dabodev.com/changeset/6254
Changed:
U trunk/dabo/lib/caselessDict.py
U trunk/dabo/lib/dates.py
U trunk/dabo/lib/propertyHelperMixin.py
U trunk/dabo/lib/reportWriter.py
Log:
Improved dictionary objects handling.
Diff:
Modified: trunk/dabo/lib/caselessDict.py
===================================================================
--- trunk/dabo/lib/caselessDict.py 2010-12-17 21:16:13 UTC (rev 6253)
+++ trunk/dabo/lib/caselessDict.py 2010-12-17 21:17:57 UTC (rev 6254)
@@ -56,15 +56,15 @@
return r
def has_key(self, key):
- return dict.has_key(self, key.lower())
+ return self.__contains__(key)
def get(self, key, default=None):
- if self.has_key(key):
+ if key in self:
return self.__getitem__(key)
return default
def setdefault(self, key, default=None):
- if not self.has_key(key):
+ if not key in self:
self.__setitem__(key, default)
return self.__getitem__(key)
@@ -79,6 +79,6 @@
print d.keys()
print d.items()
print d["PAULMCNETT"]
- print d.has_key("pAULmCNETT")
- print d.has_key("pAULmCNETTy")
+ print "pAULmCNETT" in d
+ print "pAULmCNETTy" in d
print d
Modified: trunk/dabo/lib/dates.py
===================================================================
--- trunk/dabo/lib/dates.py 2010-12-17 21:16:13 UTC (rev 6253)
+++ trunk/dabo/lib/dates.py 2010-12-17 21:17:57 UTC (rev 6254)
@@ -37,7 +37,7 @@
"%y": "%(shortyear)s",
"%Y": "%(year)s"}
if "%d" in format and "%m" in format and ("%y" in format or
"%Y" in format):
- for k in conv.keys():
+ for k in conv:
format = format.replace(k, conv[k])
format.replace(".", "\.")
exp = "^%s$" % format
Modified: trunk/dabo/lib/propertyHelperMixin.py
===================================================================
--- trunk/dabo/lib/propertyHelperMixin.py 2010-12-17 21:16:13 UTC (rev
6253)
+++ trunk/dabo/lib/propertyHelperMixin.py 2010-12-17 21:17:57 UTC (rev
6254)
@@ -68,8 +68,7 @@
"""
if evtdict is None:
evtdict = {}
- onKWs = [(kw, kw[2:]) for kw in kwdict.keys()
- if kw.startswith("On")]
+ onKWs = [(kw, kw[2:]) for kw in kwdict if kw.startswith("On")]
for kw, evtName in onKWs:
evtdict[evtName] = kwdict[kw]
del kwdict[kw]
@@ -179,7 +178,7 @@
"""
def _setProps(_propDict):
delayedSettings = {}
- for prop in _propDict.keys():
+ for prop in _propDict:
if prop in ("Name", "NameBase"):
try:
self._setName(_propDict[prop])
Modified: trunk/dabo/lib/reportWriter.py
===================================================================
--- trunk/dabo/lib/reportWriter.py 2010-12-17 21:16:13 UTC (rev 6253)
+++ trunk/dabo/lib/reportWriter.py 2010-12-17 21:17:57 UTC (rev 6254)
@@ -312,9 +312,8 @@
def _getDesProps(self):
strType = {"type" : str, "readonly" : False, "alsoDirectEdit":
True}
- props = self.AvailableProps.keys()
desProps = {}
- for prop in props:
+ for prop in self.AvailableProps:
desProps[prop] = strType.copy()
if "color" in prop.lower():
desProps[prop]["customEditor"] = "editColor"
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message:
http://leafe.com/archives/byMID/[email protected]
