提交 c9498586 authored 作者: David Warde-Farley's avatar David Warde-Farley 提交者: Arnaud Bergeron

Use next() rather than .next() where necessary.

上级 7b3b7d29
...@@ -80,9 +80,9 @@ if sys.version_info[:2] < (2, 7): ...@@ -80,9 +80,9 @@ if sys.version_info[:2] < (2, 7):
if not self: if not self:
raise KeyError('dictionary is empty') raise KeyError('dictionary is empty')
if last: if last:
key = reversed(self).next() key = next(reversed(self))
else: else:
key = iter(self).next() key = next(iter(self))
value = self.pop(key) value = self.pop(key)
return key, value return key, value
......
...@@ -4661,8 +4661,8 @@ def test_speed(): ...@@ -4661,8 +4661,8 @@ def test_speed():
else: else:
while True: while True:
try: try:
tmp = r_i.next() tmp = next(r_i)
tmp += r_ii.next() tmp += next(r_ii)
except StopIteration: except StopIteration:
break break
t1 = time.time() t1 = time.time()
......
...@@ -19,14 +19,14 @@ def flip(kern, kshp): ...@@ -19,14 +19,14 @@ def flip(kern, kshp):
it = reversed(kern) it = reversed(kern)
for i in range(kshp[0]): for i in range(kshp[0]):
for j in range(kshp[1]): for j in range(kshp[1]):
flip[i, j] = it.next() flip[i, j] = next(it)
elif len(kern.shape) == 3: elif len(kern.shape) == 3:
kern = kern.reshape(kern.shape[0], -1) kern = kern.reshape(kern.shape[0], -1)
for k in range(kern.shape[0]): for k in range(kern.shape[0]):
it = reversed(kern[k, :]) it = reversed(kern[k, :])
for i in range(kshp[0]): for i in range(kshp[0]):
for j in range(kshp[1]): for j in range(kshp[1]):
flip[k, i, j] = it.next() flip[k, i, j] = next(it)
elif len(kern.shape) == 4: elif len(kern.shape) == 4:
kern = kern.reshape(kern.shape[0], kern.shape[1], -1) kern = kern.reshape(kern.shape[0], kern.shape[1], -1)
for k in range(kern.shape[0]): for k in range(kern.shape[0]):
...@@ -34,7 +34,7 @@ def flip(kern, kshp): ...@@ -34,7 +34,7 @@ def flip(kern, kshp):
it = reversed(kern[k, m, :]) it = reversed(kern[k, m, :])
for i in range(kshp[0]): for i in range(kshp[0]):
for j in range(kshp[1]): for j in range(kshp[1]):
flip[k, m, i, j] = it.next() flip[k, m, i, j] = next(it)
else: else:
raise NotImplementedError() raise NotImplementedError()
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论