From: Mark Florisson <markflorisson88@gmail.com>
Date: Sun, 5 Dec 2010 18:45:57 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/cython/cython
X-Git-Tag: 0.14.beta0~1^2~1
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8d715668fa20b7e09bbe76bf7b0a19c3796c65fb;p=cython.git

Merge branch 'master' of https://github.com/cython/cython
---

8d715668fa20b7e09bbe76bf7b0a19c3796c65fb
diff --cc Cython/Compiler/ParseTreeTransforms.py
index bde6a633,be4d73db..dbe49e02
--- a/Cython/Compiler/ParseTreeTransforms.py
+++ b/Cython/Compiler/ParseTreeTransforms.py
@@@ -6,20 -15,11 +15,17 @@@ import Option
  from Cython.Compiler.Visitor import VisitorTransform, TreeVisitor
  from Cython.Compiler.Visitor import CythonTransform, EnvTransform, ScopeTrackingTransform
  from Cython.Compiler.ModuleNode import ModuleNode
- from Cython.Compiler.Nodes import *
- from Cython.Compiler.ExprNodes import *
- from Cython.Compiler.UtilNodes import *
+ from Cython.Compiler.UtilNodes import LetNode, LetRefNode
  from Cython.Compiler.TreeFragment import TreeFragment, TemplateTransform
  from Cython.Compiler.StringEncoding import EncodedString
- from Cython.Compiler.Errors import error, warning, CompileError
- from Cython.Compiler import PyrexTypes, Naming
+ from Cython.Compiler.Errors import error, warning, CompileError, InternalError
  
 +
 +try:
 +    set
 +except NameError:
 +    from sets import Set as set
 +
  import copy