From: Stefan Behnel <scoder@users.berlios.de>
Date: Wed, 21 Oct 2009 06:49:05 +0000 (+0200)
Subject: another merge fix
X-Git-Tag: 0.13.beta0~2^2~120
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=deffc0adf63615feb410ea09590dac25d5a44e91;p=cython.git

another merge fix
---

diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
index 9d832357..e9206ca8 100644
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@ -17,7 +17,7 @@ import Naming
 import PyrexTypes
 import TypeSlots
 from PyrexTypes import py_object_type, error_type, CTypedefType, CFuncType
-from Symtab import ModuleScope, LocalScope, GeneratorLocalScope, ClosureScope, \
+from Symtab import ModuleScope, LocalScope, ClosureScope, \
     StructOrUnionScope, PyClassScope, CClassScope
 from Cython.Utils import open_new_file, replace_suffix
 from Code import UtilityCode