[Checkins] SVN: zope.tal/trunk/src/zope/tal/ Towards Py3K: be prepared for dict views
Marius Gedminas
cvs-admin at zope.org
Thu Feb 7 20:35:51 UTC 2013
Log message for revision 129180:
Towards Py3K: be prepared for dict views
Changed:
U zope.tal/trunk/src/zope/tal/ndiff.py
U zope.tal/trunk/src/zope/tal/talgettext.py
U zope.tal/trunk/src/zope/tal/talparser.py
U zope.tal/trunk/src/zope/tal/tests/test_talgettext.py
U zope.tal/trunk/src/zope/tal/tests/test_talparser.py
-=-
Modified: zope.tal/trunk/src/zope/tal/ndiff.py
===================================================================
--- zope.tal/trunk/src/zope/tal/ndiff.py 2013-02-07 20:35:48 UTC (rev 129179)
+++ zope.tal/trunk/src/zope/tal/ndiff.py 2013-02-07 20:35:50 UTC (rev 129180)
@@ -224,7 +224,7 @@
# saved.
isjunk, junkdict = self.isjunk, {}
if isjunk:
- for elt in b2j.keys():
+ for elt in list(b2j):
if isjunk(elt):
junkdict[elt] = 1 # value irrelevant; it's a set
del b2j[elt]
Modified: zope.tal/trunk/src/zope/tal/talgettext.py
===================================================================
--- zope.tal/trunk/src/zope/tal/talgettext.py 2013-02-07 20:35:48 UTC (rev 129179)
+++ zope.tal/trunk/src/zope/tal/talgettext.py 2013-02-07 20:35:50 UTC (rev 129180)
@@ -129,7 +129,7 @@
if msgid not in domain:
domain[msgid] = []
else:
- msgids = domain.keys()
+ msgids = list(domain)
idx = msgids.index(msgid)
existing_msgid = msgids[idx]
if msgid.default != existing_msgid.default:
@@ -298,7 +298,7 @@
outfile = file(outfile, update_mode and "a" or "w")
catalog = {}
- for domain in engine.catalog.keys():
+ for domain in engine.catalog:
catalog.update(engine.catalog[domain])
messages = catalog.copy()
@@ -310,9 +310,8 @@
print(pot_header % {'time': time.ctime(), 'version': __version__},
file=outfile)
- msgids = catalog.keys()
# TODO: You should not sort by msgid, but by filename and position. (SR)
- msgids.sort()
+ msgids = sorted(catalog)
for msgid in msgids:
positions = engine.catalog[msgid]
for filename, position in positions:
Modified: zope.tal/trunk/src/zope/tal/talparser.py
===================================================================
--- zope.tal/trunk/src/zope/tal/talparser.py 2013-02-07 20:35:48 UTC (rev 129179)
+++ zope.tal/trunk/src/zope/tal/talparser.py 2013-02-07 20:35:50 UTC (rev 129180)
@@ -52,8 +52,7 @@
attrlist.append((key, value))
else:
# attrs is a dict of {name: value}
- attrlist = attrs.items()
- attrlist.sort() # For definiteness
+ attrlist = sorted(attrs.items()) # sort for definiteness
name, attrlist, taldict, metaldict, i18ndict \
= self.process_ns(name, attrlist)
attrlist = self.xmlnsattrs() + attrlist
Modified: zope.tal/trunk/src/zope/tal/tests/test_talgettext.py
===================================================================
--- zope.tal/trunk/src/zope/tal/tests/test_talgettext.py 2013-02-07 20:35:48 UTC (rev 129179)
+++ zope.tal/trunk/src/zope/tal/tests/test_talgettext.py 2013-02-07 20:35:50 UTC (rev 129180)
@@ -60,7 +60,7 @@
metal=False)()
msgids = []
for domain in engine.catalog.values():
- msgids += domain.keys()
+ msgids += list(domain)
msgids.sort()
self.assertEquals(msgids,
['A <a href="${DYNAMIC_CONTENT}">link</a>.',
Modified: zope.tal/trunk/src/zope/tal/tests/test_talparser.py
===================================================================
--- zope.tal/trunk/src/zope/tal/tests/test_talparser.py 2013-02-07 20:35:48 UTC (rev 129179)
+++ zope.tal/trunk/src/zope/tal/tests/test_talparser.py 2013-02-07 20:35:50 UTC (rev 129180)
@@ -30,7 +30,7 @@
" </m>\n"
"</doc>")
bytecode, macros = parser.getCode()
- self.assertEqual(macros.keys(), ["MACRO"])
+ self.assertEqual(list(macros), ["MACRO"])
def test_suite():
More information about the checkins
mailing list