jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

replace iteritems() with items() 

--HG--
branch : trunk
This commit is contained in:
Benjamin Peterson 2009-08-29 07:03:19 -05:00
parent 0014e65c1d
commit c2d0c52086
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
py/rest/rst.py
View File

@ -120,7 +120,7 @@ class Rest(AbstractNode):
return "" return ""
link_texts = [] link_texts = []
# XXX this could check for duplicates and remove them... # XXX this could check for duplicates and remove them...
for link, target in self.links.iteritems(): for link, target in self.links.items():
link_texts.append(".. _`%s`: %s" % (escape(link), target)) link_texts.append(".. _`%s`: %s" % (escape(link), target))
return "\n" + "\n".join(link_texts) + "\n\n" return "\n" + "\n".join(link_texts) + "\n\n"
@ -401,7 +401,7 @@ class Directive(Paragraph):
txt = super(Directive, self).text() txt = super(Directive, self).text()
txt = '.. %s::%s' % (self.name, txt[namechunksize + 3:],) txt = '.. %s::%s' % (self.name, txt[namechunksize + 3:],)
options = '\n'.join([' :%s: %s' % (k, v) for (k, v) in options = '\n'.join([' :%s: %s' % (k, v) for (k, v) in
self.options.iteritems()]) self.options.items()])
if options: if options:
txt += '\n%s' % (options,) txt += '\n%s' % (options,)

2
py/test/plugin/pytest_terminal.py
View File

@ -441,7 +441,7 @@ def folded_skips(skipped):
key = entry.path, entry.lineno, entry.message key = entry.path, entry.lineno, entry.message
d.setdefault(key, []).append(event) d.setdefault(key, []).append(event)
l = [] l = []
for key, events in d.iteritems(): for key, events in d.items():
l.append((len(events),) + key) l.append((len(events),) + key)
return l return l