提交 757aa556 authored 作者: abalkin's avatar abalkin

Issue #783: python3 compatible - fixed name conflicts.

- iter is a builtin - io is a standard lib module in 3.x.
上级 8fcf3e5e
...@@ -5,15 +5,13 @@ For design notes, see doc/advanced/module.txt ...@@ -5,15 +5,13 @@ For design notes, see doc/advanced/module.txt
""" """
__docformat__ = "restructuredtext en" __docformat__ = "restructuredtext en"
import sys, warnings
from itertools import chain
from theano import gof from theano import gof
from theano.printing import pprint from theano.printing import pprint
import io, sys from theano.compile import io
from theano.gof.python25 import all from theano.gof.python25 import all
import warnings
from itertools import chain
import theano.compile.function_module import theano.compile.function_module
import theano.compile.mode import theano.compile.mode
...@@ -1150,12 +1148,12 @@ class Module(ComponentDict): ...@@ -1150,12 +1148,12 @@ class Module(ComponentDict):
# to look for submodules on which make_module_instance needs to be called # to look for submodules on which make_module_instance needs to be called
def recurse(v): def recurse(v):
if isinstance(v,list): if isinstance(v,list):
iter = enumerate(v) iterv = enumerate(v)
else: else:
iter = v.iteritems() iterv = v.iteritems()
#backport #backport
#iter = enumerate(v) if isinstance(v,list) else v.iteritems() #iter = enumerate(v) if isinstance(v,list) else v.iteritems()
for sk,sv in iter: for sk,sv in iterv:
if isinstance(sv,(list,dict)): if isinstance(sv,(list,dict)):
sv = recurse(sv) sv = recurse(sv)
elif isinstance(sv,Module): elif isinstance(sv,Module):
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论