diff --git a/evaluate.py b/evaluate.py
index a8265bcc..20085eb5 100644
--- a/evaluate.py
+++ b/evaluate.py
@@ -209,7 +209,7 @@ class Executable(object):
                 self.iterator = iterator
 
             def push_back(self, key, value):
-                self.pushes.append((key,value))
+                self.pushes.append((key, value))
 
             def __iter__(self):
                 return self
@@ -226,7 +226,6 @@ class Executable(object):
 
         return iter(PushBackIterator(iterate()))
 
-
     def set_param_cb(self, func):
         self.func = func
         func.param_cb = self.get_params
@@ -392,7 +391,6 @@ class Execution(Executable):
                 #print dec.parent
         return func
 
-
     @memoize_default(default=[])
     def get_return_types(self):
         """
@@ -428,7 +426,6 @@ class Execution(Executable):
             else:
                 debug.warning("no execution possible", func)
 
-
         debug.dbg('exec results:', stmts, self.base, repr(self))
 
         return strip_imports(stmts)
@@ -832,7 +829,7 @@ def follow_paths(path, results, position=None):
             if fp is not None:
                 results_new += fp
             else:
-                # this means stop iteration 
+                # this means stop iteration
                 return results
     return results_new
 
diff --git a/parsetest.py b/parsetest.py
index 91c76279..08077c6d 100644
--- a/parsetest.py
+++ b/parsetest.py
@@ -158,12 +158,11 @@ a = 3; b = ""
 b,a=a,b
 a.
 
-class C(object):
-    def c_a(self):
-        self.c_b = 1
-
-test = [1,2]
+def gen():
+    yield 1
+    yield ""
 
+gen_exe = gen()
 
 def dec(func):
     def wrapper(*args, **kwargs):
@@ -176,5 +175,6 @@ def fu(a, b, c, *args, **kwargs):
 
 exe = fu(list, c=set, d='')
 
-exe[0].
-exe[4]['d']
+#exe[0].
+#exe[4]['d']
+gen_exe.
diff --git a/test/completion/functions.py b/test/completion/functions.py
index 08de3088..068188d5 100644
--- a/test/completion/functions.py
+++ b/test/completion/functions.py
@@ -226,3 +226,15 @@ exe = fu(list, set, 3, '', d='')
 exe[3][0].upper
 #? []
 exe[3][0].real
+
+
+# -----------------
+# generators
+# -----------------
+
+def gen():
+    yield 1
+    yield ""
+
+exe = gen()
+exe.