fix py2/py3 compat for 'iter.next()/next(iter)' and 'dict.values()/list(dict.values())'. refs #1350.

This commit is contained in:
Takayuki Shimizukawa 2014-05-01 13:08:36 +09:00
parent 071fb45a54
commit 5fd8dc885f
2 changed files with 2 additions and 2 deletions

View File

@ -353,7 +353,7 @@ class DFAState(object):
def __init__(self, nfaset, final): def __init__(self, nfaset, final):
assert isinstance(nfaset, dict) assert isinstance(nfaset, dict)
assert isinstance(iter(nfaset).next(), NFAState) assert isinstance(next(iter(nfaset)), NFAState)
assert isinstance(final, NFAState) assert isinstance(final, NFAState)
self.nfaset = nfaset self.nfaset = nfaset
self.isfinal = final in nfaset self.isfinal = final in nfaset

View File

@ -38,7 +38,7 @@ def test_build(app):
undoc_py, undoc_c = pickle.loads((app.outdir / 'undoc.pickle').bytes()) undoc_py, undoc_c = pickle.loads((app.outdir / 'undoc.pickle').bytes())
assert len(undoc_c) == 1 assert len(undoc_c) == 1
# the key is the full path to the header file, which isn't testable # the key is the full path to the header file, which isn't testable
assert undoc_c.values()[0] == [('function', 'Py_SphinxTest')] assert list(undoc_c.values())[0] == [('function', 'Py_SphinxTest')]
assert 'test_autodoc' in undoc_py assert 'test_autodoc' in undoc_py
assert 'funcs' in undoc_py['test_autodoc'] assert 'funcs' in undoc_py['test_autodoc']