From: Mark Florisson <markflorisson88@gmail.com>
Date: Wed, 1 Dec 2010 17:27:54 +0000 (+0100)
Subject: branch merge
X-Git-Tag: 0.14.beta0~1^2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fae8606ebfc5946c0894576fba571c70af0f27d2;p=cython.git

branch merge
---

fae8606ebfc5946c0894576fba571c70af0f27d2
diff --cc Cython/Compiler/ParseTreeTransforms.py
index 7967a197,44b69244..8e7a7fd7
--- a/Cython/Compiler/ParseTreeTransforms.py
+++ b/Cython/Compiler/ParseTreeTransforms.py
@@@ -6,14 -11,9 +11,15 @@@ from Cython.Compiler.ExprNodes import 
  from Cython.Compiler.UtilNodes import *
  from Cython.Compiler.TreeFragment import TreeFragment, TemplateTransform
  from Cython.Compiler.StringEncoding import EncodedString
- from Cython.Compiler.Errors import error, CompileError
- from Cython.Compiler import PyrexTypes
+ from Cython.Compiler.Errors import error, warning, CompileError
+ from Cython.Compiler import PyrexTypes, Naming
+ 
 +
 +try:
 +    set
 +except NameError:
 +    from sets import Set as set
 +
  import copy
  
  
diff --cc setup.py
index 23d550a5,1db45e0f..e1f28e6d
--- a/setup.py
+++ b/setup.py
@@@ -80,11 -80,11 +80,11 @@@ if 'setuptools' in sys.modules
      scripts = []
  else:
      if os.name == "posix":
 -        scripts = ["bin/cython"]
 +        scripts = ["bin/cython", "bin/cygdb"]
      else:
 -        scripts = ["cython.py"]
 +        scripts = ["cython.py", "cygdb.py"]
  
- def compile_cython_modules(profile=False):
+ def compile_cython_modules(profile=False, compile_more=False, cython_with_refnanny=False):
      source_root = os.path.abspath(os.path.dirname(__file__))
      compiled_modules = ["Cython.Plex.Scanners",
                          "Cython.Plex.Actions",