dabo Commit
Revision 6258
Date: 2010-12-17 14:32:11 -0800 (Fri, 17 Dec 2010)
Author: Jacekk
Trac: http://trac.dabodev.com/changeset/6258
Changed:
U trunk/dabo/lib/datanav/Page.py
Log:
Minor changes in dictionary objects handling.
Diff:
Modified: trunk/dabo/lib/datanav/Page.py
===================================================================
--- trunk/dabo/lib/datanav/Page.py 2010-12-17 22:15:02 UTC (rev 6257)
+++ trunk/dabo/lib/datanav/Page.py 2010-12-17 22:32:11 UTC (rev 6258)
@@ -203,9 +203,8 @@
elif action== "show":
# Get the descrips and order
sf = self.sortFields
- sfk = sf.keys()
dd = [(sf[kk][0], kk, "%s %s" % (sf[kk][2], sf[kk][1]))
- for kk in sfk ]
+ for kk in sf]
sortDesc = [itm[2] for itm in sorted(dd)]
sortedList = dabo.ui.sortList(sortDesc)
newPos = 0
@@ -257,7 +256,7 @@
parts = lambda (k): (k, sf[k][1].upper())
flds = sorted((self.sortFields[k][0], k, " ".join(parts(k)))
- for k in self.sortFields.keys())
+ for k in self.sortFields)
if infoOnly:
return [e[1:] for e in flds]
else:
@@ -273,9 +272,8 @@
baseWhere = ""
biz.setWhereClause(baseWhere)
tbl = biz.DataSource
- flds = self.selectFields.keys()
whr = ""
- for fld in flds:
+ for fld in self.selectFields:
if fld in biz.VirtualFields:
#virtual field, save for later use and ignore
self.__virtualFilters.append(fld)
_______________________________________________
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]
