Various cosmetic touch-ups.

diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
index 7239c635748d8bcf1c51aa1a0b2843f5801155f4..7dbaf917b3357d0dd2be6d88a929025e47cd9ce4 100755 (executable)
--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@ -5337,13 +5337,12 @@ class PowNode(NumBinopNode):
             self.operand2.result())
 
 
-# Note: This class is temporary "shut down" into an ineffective mode temp
+# Note: This class is temporarily "shut down" into an ineffective temp
 # allocation mode.
 #
-# More sophisticated temp reuse was going on before,
-# one could have a look at adding this again after /all/ classes
-# are converted to the new temp scheme. (The temp juggling cannot work
-# otherwise).
+# More sophisticated temp reuse was going on before, one could have a
+# look at adding this again after /all/ classes are converted to the
+# new temp scheme. (The temp juggling cannot work otherwise).
 class BoolBinopNode(ExprNode):
     #  Short-circuiting boolean operation.
     #

diff --git a/Cython/Compiler/Optimize.py b/Cython/Compiler/Optimize.py
index 8eb1e92d06b2de540842ad1122885c7aaeb65615..4a77e69406ba22d7a810bde4737ad379d5b84458 100644 (file)
--- a/Cython/Compiler/Optimize.py
+++ b/Cython/Compiler/Optimize.py
@@ -1444,8 +1444,9 @@ class OptimizeBuiltinCalls(Visitor.EnvTransform):
         elif len(pos_args) != 1:
             self._error_wrong_arg_count('bool', node, pos_args, '0 or 1')
             return node
-        return pos_args[0].coerce_to_boolean(
-            self.current_env()).coerce_to_pyobject(self.current_env())
+        else:
+            return pos_args[0].coerce_to_boolean(
+                self.current_env()).coerce_to_pyobject(self.current_env())
 
     ### builtin functions
 

diff --git a/Cython/Compiler/PyrexTypes.py b/Cython/Compiler/PyrexTypes.py
index f76922bb1cf89044921c80021f1ace45c804197e..f1ad4eaf18c9984fcaecfae2ffdb05e5c99afa48 100755 (executable)
--- a/Cython/Compiler/PyrexTypes.py
+++ b/Cython/Compiler/PyrexTypes.py
@@ -2426,7 +2426,7 @@ def independent_spanning_type(type1, type2):
     elif (type1 is c_bint_type or type2 is c_bint_type) and (type1.is_numeric and type2.is_numeric):
         # special case: if one of the results is a bint and the other
         # is another C integer, we must prevent returning a numeric
-        # type so that we do not loose the ability to coerce to a
+        # type so that we do not lose the ability to coerce to a
         # Python bool if we have to.
         return py_object_type
     span_type = _spanning_type(type1, type2)

diff --git a/Cython/Compiler/TypeInference.py b/Cython/Compiler/TypeInference.py
index e0daaabc132c90a1367955e31628f94ca86ee748..2b865b507a1cb607d9a3a9709d53c106144e0901 100644 (file)
--- a/Cython/Compiler/TypeInference.py
+++ b/Cython/Compiler/TypeInference.py
@@ -296,7 +296,8 @@ def find_spanning_type(type1, type2):
         return py_object_type
     else:
         result_type = PyrexTypes.spanning_type(type1, type2)
-    if result_type in (PyrexTypes.c_double_type, PyrexTypes.c_float_type, Builtin.float_type):
+    if result_type in (PyrexTypes.c_double_type, PyrexTypes.c_float_type,
+                       Builtin.float_type):
         # Python's float type is just a C double, so it's safe to
         # use the C type instead
         return PyrexTypes.c_double_type