cleanup relative to 0.12

diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
index f42ab943c7029890a9f1326c8cdeeec8ef23476e..ff8e65256bf40f18b9102d23f75b90e6cd99ba23 100755 (executable)
--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@ -4036,6 +4036,7 @@ class UnboundMethodNode(ExprNode):
                 code.error_goto_if_null(self.result(), self.pos)))
         code.put_gotref(self.py_result())
 
+
 class PyCFunctionNode(AtomicExprNode):
     #  Helper class used in the implementation of Python
     #  class definitions. Constructs a PyCFunction object
@@ -4127,7 +4128,6 @@ class UnopNode(ExprNode):
         if self.is_py_operation():
             self.gil_error()
 
-
     def is_cpp_operation(self):
         return self.operand.type.is_cpp_class
     
@@ -4166,7 +4166,6 @@ class UnopNode(ExprNode):
             self.type_error()
             return
         self.type = function.type.return_type
-        
 
 
 class NotNode(ExprNode):
@@ -4748,7 +4747,6 @@ class NumBinopNode(BinopNode):
     
     def py_operation_function(self):
         return self.py_functions[self.operator]
-    
 
     py_functions = {
         "|":        "PyNumber_Or",
@@ -4764,7 +4762,7 @@ class NumBinopNode(BinopNode):
         "%":        "PyNumber_Remainder",
         "**":       "PyNumber_Power"
     }
-    
+
 
 class IntBinopNode(NumBinopNode):
     #  Binary operation taking integer arguments.
@@ -5523,7 +5521,6 @@ class PrimaryCmpNode(ExprNode, CmpNode):
         self.operand2.analyse_types(env)
         if self.is_cpp_comparison():
             self.analyse_cpp_comparison(env)
-            return
         if self.cascade:
             self.cascade.analyse_types(env)
 
@@ -5636,7 +5633,7 @@ class PrimaryCmpNode(ExprNode, CmpNode):
         self.operand2.annotate(code)
         if self.cascade:
             self.cascade.annotate(code)
-    
+
 
 class CascadedCmpNode(Node, CmpNode):
     #  A CascadedCmpNode is not a complete expression node. It 

diff --git a/Cython/Compiler/Main.py b/Cython/Compiler/Main.py
index 4d35ed3c42af31655f03b2f18e158471f423713c..2e11ed03b58cb9186568b49ec2a1b3ad0220ac66 100644 (file)
--- a/Cython/Compiler/Main.py
+++ b/Cython/Compiler/Main.py
@@ -76,7 +76,6 @@ class Context(object):
         self.compiler_directives = compiler_directives
         self.cpp = cpp
 
-
         self.pxds = {} # full name -> node tree
 
         standard_include_path = os.path.abspath(

diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
index 8bb096eb94d10c177cede985cd20f232970396df..6d13154a785ab5c9cf66d1119e70cd460d099521 100644 (file)
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@ -342,7 +342,6 @@ class StatListNode(Node):
     
     def analyse_expressions(self, env):
         #print "StatListNode.analyse_expressions" ###
-        entry = env.entries.get("cpp_sum", None)
         for stat in self.stats:
             stat.analyse_expressions(env)
     

diff --git a/Cython/Compiler/Options.py b/Cython/Compiler/Options.py
index d265c15da96e176d622f32e82c15faf96dd1b42b..9fccdf74c8ed712bf8ad34cc68dd2da2fe5827b9 100644 (file)
--- a/Cython/Compiler/Options.py
+++ b/Cython/Compiler/Options.py
@@ -6,7 +6,6 @@ cache_builtins = 1  #  Perform lookups on builtin names only once
 
 embed_pos_in_docstring = 0
 gcc_branch_hints = 1
-cplus = 0
 
 pre_import = None
 docstrings = True

diff --git a/Cython/Compiler/Parsing.pxd b/Cython/Compiler/Parsing.pxd
index 982088bee5802ad2b8e46982ca2a71b5e5dd10a5..c5f19761c64b88a622247d98b895d20cba534e87 100644 (file)
--- a/Cython/Compiler/Parsing.pxd
+++ b/Cython/Compiler/Parsing.pxd
@@ -151,4 +151,3 @@ cpdef p_code(PyrexScanner s, level= *)
 cpdef p_compiler_directive_comments(PyrexScanner s)
 cpdef p_module(PyrexScanner s, pxd, full_module_name)
 cpdef p_cpp_class_definition(PyrexScanner s, ctx)
-

diff --git a/Cython/Compiler/Parsing.py b/Cython/Compiler/Parsing.py
index 871633b5a5ca8b4bcfa26039575ea82d53d0aa93..e858a16b6e7c8f6aa3a1314e10440cc89231804d 100644 (file)
--- a/Cython/Compiler/Parsing.py
+++ b/Cython/Compiler/Parsing.py
@@ -1906,7 +1906,6 @@ def p_buffer_or_template(s, base_type_node):
         keyword_args = keyword_dict,
         base_type_node = base_type_node)
     return result
-
     
 
 def looking_at_name(s):

diff --git a/Cython/Compiler/PyrexTypes.py b/Cython/Compiler/PyrexTypes.py
index b0bd832b3740e88d72148758b086bb0c339d5701..c23c6aee6cdf67a3a00dbc883c6057d9091e6568 100755 (executable)
--- a/Cython/Compiler/PyrexTypes.py
+++ b/Cython/Compiler/PyrexTypes.py
@@ -1359,7 +1359,6 @@ class CNullPtrType(CPtrType):
     is_null_ptr = 1
     
 
-
 class CReferenceType(CType):
 
     is_reference = 1
@@ -2271,7 +2270,6 @@ def best_match(args, functions, pos):
     return None
 
 
-
 def widest_numeric_type(type1, type2):
     # Given two numeric types, return the narrowest type
     # encompassing both of them.

diff --git a/Cython/Compiler/Symtab.py b/Cython/Compiler/Symtab.py
index 63deaea429fe5e3c62d3a169c930e0dca6ba7c42..6596c71499609d60fccda921af0966bb79693e18 100644 (file)
--- a/Cython/Compiler/Symtab.py
+++ b/Cython/Compiler/Symtab.py
@@ -1483,7 +1483,6 @@ class CClassScope(ClassScope):
             entry.is_inherited = 1
             
         
-
 class CppClassScope(Scope):
     #  Namespace of a C++ class.
     inherited_var_entries = []

diff --git a/Cython/Compiler/Tests/TestDecorators.py b/Cython/Compiler/Tests/TestDecorators.py
index c8ec01b82ce3b9f1035df1f87106b36f93c7a5df..7f494351b8b16a8ef032554556858333f716a56e 100644 (file)
--- a/Cython/Compiler/Tests/TestDecorators.py
+++ b/Cython/Compiler/Tests/TestDecorators.py
@@ -12,6 +12,7 @@ class TestDecorator(TransformTest):
         def decorated():
             pass
         """)
+        
         self.assertCode(u"""
         def decorator(fun):
             return fun