Merge pull request #164 from nouiz/pep8

theano/tests/test_printing.py

@@ -22,14 +22,12 @@ def test_pydotprint_cond_highlight():
     """
 
     # Skip test if pydot is not available.
-    try:
-        import pydot
-    except ImportError:
+    if not theano.printing.pydot_imported:
         raise SkipTest('pydot not available')
 
     x = tensor.dvector()
-    f = theano.function([x], x*2)
-    f([1,2,3,4])
+    f = theano.function([x], x * 2)
+    f([1, 2, 3, 4])
 
     s = StringIO.StringIO()
     new_handler = logging.StreamHandler(s)
@@ -39,19 +37,21 @@ def test_pydotprint_cond_highlight():
     theano.theano_logger.removeHandler(orig_handler)
     theano.theano_logger.addHandler(new_handler)
     try:
-        theano.printing.pydotprint(f, cond_highlight = True, print_output_file=False)
+        theano.printing.pydotprint(f, cond_highlight=True,
+                                   print_output_file=False)
     finally:
         theano.theano_logger.addHandler(orig_handler)
         theano.theano_logger.removeHandler(new_handler)
 
-    assert s.getvalue() == 'pydotprint: cond_highlight is set but there is no IfElse node in the graph\n'
+    assert (s.getvalue() == 'pydotprint: cond_highlight is set but there'
+            ' is no IfElse node in the graph\n')
 
 
 def test_pydotprint_profile():
     """Just check that pydotprint does not crash with ProfileMode."""
 
     A = tensor.matrix()
-    f = theano.function([A], A+1, mode='ProfileMode')
+    f = theano.function([A], A + 1, mode='ProfileMode')
     theano.printing.pydotprint(f, print_output_file=False)
 
 
@@ -59,17 +59,17 @@ def test_min_informative_str():
     """ evaluates a reference output to make sure the
         min_informative_str function works as intended """
 
-    A = tensor.matrix(name = 'A')
-    B = tensor.matrix(name = 'B')
+    A = tensor.matrix(name='A')
+    B = tensor.matrix(name='B')
     C = A + B
     C.name = 'C'
-    D = tensor.matrix(name = 'D')
-    E = tensor.matrix(name = 'E')
+    D = tensor.matrix(name='D')
+    E = tensor.matrix(name='E')
 
     F = D + E
     G = C + F
 
-    mis = min_informative_str(G)
+    mis = min_informative_str(G).replace("\t", "        ")
 
     reference = """A. Elemwise{add,no_inplace}
         B. C
@@ -78,7 +78,7 @@ def test_min_informative_str():
                 E. E"""
 
     if mis != reference:
-        print '--'+mis+'--'
-        print '--'+reference+'--'
+        print '--' + mis + '--'
+        print '--' + reference + '--'
 
     assert mis == reference