Merge pull request #424 from delallea/minor

theano/compile/io.py

@@ -5,7 +5,8 @@ from theano import gof
 from sharedvalue import SharedVariable
 
 import logging
-_logger=logging.getLogger("theano.compile.io")
+_logger = logging.getLogger("theano.compile.io")
+
 
 class SymbolicInput(object):
     """
@@ -49,7 +50,7 @@ class SymbolicInput(object):
     def __init__(self, variable, name=None, update=None, mutable=None,
             strict=False, allow_downcast=None, autoname=True,
             implicit=False):
-        assert implicit is not None # Safety check.
+        assert implicit is not None  # Safety check.
         self.variable = variable
         if  (autoname and name is None):
             self.name = variable.name
@@ -194,8 +195,7 @@ class In(SymbolicInput):
     # try to keep it synchronized.
     def __init__(self, variable, name=None, value=None, update=None,
             mutable=None, strict=False, allow_downcast=None, autoname=True,
-            implicit=None, borrow=None, shared = False):
-
+            implicit=None, borrow=None, shared=False):
 
         #if shared, an input's value comes from its persistent storage, not from a default stored
         #in the function or from the caller
@@ -206,7 +206,7 @@ class In(SymbolicInput):
         # mutable=True should require borrow=True. Raise warning when borrow is explicitely set
         # to False with mutable=True.
         if mutable:
-            if borrow==False:
+            if borrow == False:
                 _logger.warning("Symbolic input for variable %s (name=%s) has "
                         "flags mutable=True, borrow=False. This combination is "
                         "incompatible since mutable=True implies that the "

theano/gof/compiledir.py

@@ -15,7 +15,8 @@ compiledir_format_dict = {"platform": platform.platform(),
                           "theano_version": theano.__version__,
                          }
 compiledir_format_keys = ", ".join(compiledir_format_dict.keys())
-default_compiledir_format = "compiledir_%(platform)s-%(processor)s-%(python_version)s"
+default_compiledir_format =\
+                    "compiledir_%(platform)s-%(processor)s-%(python_version)s"
 
 AddConfigVar("compiledir_format",
              textwrap.fill(textwrap.dedent("""\
@@ -53,7 +54,7 @@ def filter_compiledir(path):
             # the same directory at the same time.
             if e.errno != errno.EEXIST:
                 raise ValueError(
-                    "Unable to create to create the compiledir directory"
+                    "Unable to create the compiledir directory"
                     " '%s'. Check the permissions." % path)
 
     # PROBLEM: sometimes the initial approach based on
@@ -118,7 +119,7 @@ def print_compiledir_content():
 
     compiledir = theano.config.compiledir
     table = []
-    more_then_one_ops = 0
+    more_than_one_ops = 0
     zeros_op = 0
     for dir in os.listdir(compiledir):
         file = None
@@ -131,7 +132,7 @@ def print_compiledir_content():
                 if len(ops) == 0:
                     zeros_op += 1
                 elif len(ops) > 1:
-                    more_then_one_ops += 1
+                    more_than_one_ops += 1
                 else:
                     types = list(set([x for x in flatten(keydata.keys)
                                       if isinstance(x, theano.gof.Type)]))
@@ -142,7 +143,7 @@ def print_compiledir_content():
             if file is not None:
                 file.close()
 
-    print "List %d compiled individual op in this theano cache %s:" % (
+    print "List of %d compiled individual ops in this theano cache %s:" % (
         len(table), compiledir)
     print "sub directory/Op/a set of the different associated Theano type"
     table = sorted(table, key=lambda t: str(t[1]))
@@ -153,13 +154,12 @@ def print_compiledir_content():
         table_op_class[op.__class__] += 1
 
     print
-    print "List %d of individual compiled Op class and" % (len(table_op_class)),
-    print " the number of time it got compiled"
+    print ("List of %d individual compiled Op classes and "
+           "the number of times they got compiled" % len(table_op_class))
     table_op_class = sorted(table_op_class.iteritems(), key=lambda t: t[1])
     for op_class, nb in table_op_class:
         print op_class, nb
-    print ("Skipped %d files that contained more then"
-           " 1 op (was compiled with the c linker)" % (more_then_one_ops))
-    print ("Skipped %d files that contained 0 op"
-           "(Are they always theano.scalar ops?)" % (
-            more_then_one_ops))
+    print ("Skipped %d files that contained more than"
+           " 1 op (was compiled with the C linker)" % more_than_one_ops)
+    print ("Skipped %d files that contained 0 op "
+           "(are they always theano.scalar ops?)" % zeros_op)