diff options
author | Marius Gedminas <marius@gedmin.as> | 2013-02-07 20:35:50 +0000 |
---|---|---|
committer | Marius Gedminas <marius@gedmin.as> | 2013-02-07 20:35:50 +0000 |
commit | b1277c05599b137127611f584ffc95e07a49d60d (patch) | |
tree | 7c6c59025966b8c1a1b98a8b58b44e2da065e7a2 /src | |
parent | acd3c6c27f847c836e12cf987d5e0c12960b383b (diff) | |
download | zope-tal-b1277c05599b137127611f584ffc95e07a49d60d.tar.gz |
Towards Py3K: be prepared for dict views
Diffstat (limited to 'src')
-rw-r--r-- | src/zope/tal/ndiff.py | 2 | ||||
-rw-r--r-- | src/zope/tal/talgettext.py | 7 | ||||
-rw-r--r-- | src/zope/tal/talparser.py | 3 | ||||
-rw-r--r-- | src/zope/tal/tests/test_talgettext.py | 2 | ||||
-rw-r--r-- | src/zope/tal/tests/test_talparser.py | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/src/zope/tal/ndiff.py b/src/zope/tal/ndiff.py index 306b057..4bffa14 100644 --- a/src/zope/tal/ndiff.py +++ b/src/zope/tal/ndiff.py @@ -224,7 +224,7 @@ class SequenceMatcher(object): # 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] diff --git a/src/zope/tal/talgettext.py b/src/zope/tal/talgettext.py index 77172ed..80859e8 100644 --- a/src/zope/tal/talgettext.py +++ b/src/zope/tal/talgettext.py @@ -129,7 +129,7 @@ class POEngine(DummyEngine): 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 @@ def main(): 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 @@ def main(): 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: diff --git a/src/zope/tal/talparser.py b/src/zope/tal/talparser.py index a82254f..9adba2d 100644 --- a/src/zope/tal/talparser.py +++ b/src/zope/tal/talparser.py @@ -52,8 +52,7 @@ class TALParser(XMLParser): 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 diff --git a/src/zope/tal/tests/test_talgettext.py b/src/zope/tal/tests/test_talgettext.py index be4967a..f0e9ce8 100644 --- a/src/zope/tal/tests/test_talgettext.py +++ b/src/zope/tal/tests/test_talgettext.py @@ -60,7 +60,7 @@ class test_POEngine(unittest.TestCase): 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>.', diff --git a/src/zope/tal/tests/test_talparser.py b/src/zope/tal/tests/test_talparser.py index 7ae1282..58c8609 100644 --- a/src/zope/tal/tests/test_talparser.py +++ b/src/zope/tal/tests/test_talparser.py @@ -30,7 +30,7 @@ class TALParserTestCase(unittest.TestCase): " </m>\n" "</doc>") bytecode, macros = parser.getCode() - self.assertEqual(macros.keys(), ["MACRO"]) + self.assertEqual(list(macros), ["MACRO"]) def test_suite(): |