Merge pull request #2744 from mohammadpz/pep8

theano/configparser.py

@@ -217,8 +217,8 @@ def AddConfigVar(name, doc, configparam, root=config, in_c_key=True):
                 _i_am_a_config_class = True
             setattr(root.__class__, sections[0], SubObj())
         newroot = getattr(root, sections[0])
-        if (not getattr(newroot, '_i_am_a_config_class', False)
-                or isinstance(newroot, type)):
+        if (not getattr(newroot, '_i_am_a_config_class', False) or
+                isinstance(newroot, type)):
             raise TypeError(
                 'Internal config nodes must be config class instances',
                 newroot)
@@ -235,7 +235,8 @@ def AddConfigVar(name, doc, configparam, root=config, in_c_key=True):
         if not callable(configparam.default):
             configparam.__get__()
         else:
-            # We do not want to evaluate now the default value when it is a callable.
+            # We do not want to evaluate now the default value
+            # when it is a callable.
             try:
                 fetch_val_for_key(configparam.fullname)
                 # The user provided a value, filter it now.

theano/ifelse.py

@@ -10,15 +10,6 @@ which value to report. Note also that `switch` is an elemwise operation (so
 it picks each entry of a matrix according to the condition) while `ifelse`
 is a global operation with a scalar condition.
 """
-
-__docformat__ = 'restructedtext en'
-__authors__ = ("Razvan Pascanu "
-               "James Bergstra "
-               "Dumitru Erhan "
-               "David Warde-Farley")
-__copyright__ = "(c) 2010, Universite de Montreal"
-__contact__ = "Razvan Pascanu <r.pascanu@gmail>"
-
 from copy import deepcopy
 from itertools import izip
 import logging
@@ -34,6 +25,15 @@ from theano.tensor import opt
 from theano.scan_module.scan_utils import find_up
 from theano.scan_module.scan_utils import clone
 
+
+__docformat__ = 'restructedtext en'
+__authors__ = ("Razvan Pascanu "
+               "James Bergstra "
+               "Dumitru Erhan "
+               "David Warde-Farley")
+__copyright__ = "(c) 2010, Universite de Montreal"
+__contact__ = "Razvan Pascanu <r.pascanu@gmail>"
+
 _logger = logging.getLogger('theano.ifelse')
 
 
@@ -338,13 +338,13 @@ def ifelse(condition, then_branch, else_branch, name=None):
             # converted into one, then we try to do that.
             # This case happens when one of the elements has a GPU type,
             # for instance a shared variable that was silently moved to GPU.
-            if (isinstance(then_branch_elem.type, TensorType)
-                    and not isinstance(else_branch_elem.type, TensorType)):
+            if (isinstance(then_branch_elem.type, TensorType) and not
+                    isinstance(else_branch_elem.type, TensorType)):
                 else_branch_elem = then_branch_elem.type.filter_variable(
                     else_branch_elem)
 
-            elif (isinstance(else_branch_elem.type, TensorType)
-                    and not isinstance(then_branch_elem.type, TensorType)):
+            elif (isinstance(else_branch_elem.type, TensorType) and not
+                    isinstance(then_branch_elem.type, TensorType)):
                 then_branch_elem = else_branch_elem.type.filter_variable(
                     then_branch_elem)
 
@@ -471,7 +471,7 @@ def ifelse_lift_single_if_through_acceptable_ops(main_node):
     ts = node.inputs[1:][:op.n_outs]
     fs = node.inputs[1:][op.n_outs:]
 
-    outs = main_node.outputs
+    # outs = main_node.outputs
     mop = main_node.op
     true_ins = []
     false_ins = []
@@ -486,8 +486,8 @@ def ifelse_lift_single_if_through_acceptable_ops(main_node):
             false_ins.append(x)
     true_eval = mop(*true_ins, **dict(return_list=True))
     false_eval = mop(*false_ins, **dict(return_list=True))
-    #true_eval  = clone(outs, replace = dict(zip(node.outputs, ts)))
-    #false_eval = clone(outs, replace = dict(zip(node.outputs, fs)))
+    # true_eval  = clone(outs, replace = dict(zip(node.outputs, ts)))
+    # false_eval = clone(outs, replace = dict(zip(node.outputs, fs)))
 
     nw_outs = ifelse(node.inputs[0], true_eval, false_eval, return_list=True)
     return nw_outs
@@ -567,8 +567,8 @@ class CondMerge(gof.Optimizer):
                 if merging_node.op.name:
                     mn_name = merging_node.op.name
                 pl_name = '?'
-                mn_n_ts = len(mn_ts)
-                mn_n_fs = len(mn_fs)
+                # mn_n_ts = len(mn_ts)
+                # mn_n_fs = len(mn_fs)
                 if proposal.op.name:
                     pl_name = proposal.op.name
                 new_ifelse = IfElse(
@@ -673,8 +673,8 @@ def cond_merge_random_op(main_node):
             if merging_node.op.name:
                 mn_name = merging_node.op.name
             pl_name = '?'
-            mn_n_ts = len(mn_ts)
-            mn_n_fs = len(mn_fs)
+            # mn_n_ts = len(mn_ts)
+            # mn_n_fs = len(mn_fs)
             if proposal.op.name:
                 pl_name = proposal.op.name
             new_ifelse = IfElse(

theano/tests/test_flake8.py

@@ -17,13 +17,8 @@ except ImportError:
     flake8_available = False
 
 whitelist_flake8 = [
-    "updates.py",
     "__init__.py",
-    "configparser.py",
-    "ifelse.py",
     "version.py",
-    "configdefaults.py",
-    "gradient.py",
     "compat/python2x.py",
     "compat/six.py",
     "compat/__init__.py",

theano/updates.py

 """Defines Updates object for storing a (SharedVariable, new_value) mapping.
 
 """
+from theano.compat.python2x import OrderedDict
+
+from theano.compile.sharedvalue import SharedVariable
+import logging
+import warnings
+
+
 __authors__ = "theano-dev"
 __copyright__ = "(c) 2010, Universite de Montreal"
 __license__ = "3-clause BSD License"
@@ -8,12 +15,7 @@ __contact__ = "theano-dev <theano-dev@googlegroups.com>"
 
 __docformat__ = "restructuredtext en"
 
-from theano.compat.python2x import OrderedDict
-
-from theano.compile.sharedvalue import SharedVariable
-import logging
 logger = logging.getLogger('theano.updates')
-import warnings
 
 
 # Must be an OrderedDict or updates will be applied in a non-deterministic