Py3: Use global next() function instead of iterator method
This commit is contained in:
parent
ef462a05d7
commit
be306c8439
|
@ -5,7 +5,7 @@ from pathod import language
|
|||
|
||||
|
||||
def parse_request(s):
|
||||
return language.parse_pathoc(s).next()
|
||||
return next(language.parse_pathoc(s))
|
||||
|
||||
|
||||
def test_unique_name():
|
||||
|
@ -16,9 +16,9 @@ def test_unique_name():
|
|||
class TestDisconnects:
|
||||
|
||||
def test_parse_pathod(self):
|
||||
a = language.parse_pathod("400:d0").next().actions[0]
|
||||
a = next(language.parse_pathod("400:d0")).actions[0]
|
||||
assert a.spec() == "d0"
|
||||
a = language.parse_pathod("400:dr").next().actions[0]
|
||||
a = next(language.parse_pathod("400:dr")).actions[0]
|
||||
assert a.spec() == "dr"
|
||||
|
||||
def test_at(self):
|
||||
|
@ -42,12 +42,12 @@ class TestDisconnects:
|
|||
class TestInject:
|
||||
|
||||
def test_parse_pathod(self):
|
||||
a = language.parse_pathod("400:ir,@100").next().actions[0]
|
||||
a = next(language.parse_pathod("400:ir,@100")).actions[0]
|
||||
assert a.offset == "r"
|
||||
assert a.value.datatype == "bytes"
|
||||
assert a.value.usize == 100
|
||||
|
||||
a = language.parse_pathod("400:ia,@100").next().actions[0]
|
||||
a = next(language.parse_pathod("400:ia,@100")).actions[0]
|
||||
assert a.offset == "a"
|
||||
|
||||
def test_at(self):
|
||||
|
@ -62,7 +62,7 @@ class TestInject:
|
|||
|
||||
def test_serve(self):
|
||||
s = StringIO()
|
||||
r = language.parse_pathod("400:i0,'foo'").next()
|
||||
r = next(language.parse_pathod("400:i0,'foo'"))
|
||||
assert language.serve(r, s, {})
|
||||
|
||||
def test_spec(self):
|
||||
|
@ -96,7 +96,7 @@ class TestPauses:
|
|||
assert v.offset == "a"
|
||||
|
||||
def test_request(self):
|
||||
r = language.parse_pathod('400:p10,10').next()
|
||||
r = next(language.parse_pathod('400:p10,10'))
|
||||
assert r.actions[0].spec() == "p10,10"
|
||||
|
||||
def test_spec(self):
|
||||
|
|
Loading…
Reference in New Issue