From d1e0836d23b4e30b4220d71933bf1912097954eb Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 3 Sep 2012 23:47:50 +0200
Subject: [PATCH] Minor fix to evaluate with _return in ProcPool execution.

---
 src/server/procpool.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/server/procpool.py b/src/server/procpool.py
index 8de90a024f..b1c49215a9 100644
--- a/src/server/procpool.py
+++ b/src/server/procpool.py
@@ -84,8 +84,6 @@ class ProcPoolChild(AMPChild):
 
         """
 
-
-        import ev, utils
         class Ret(object):
             "Helper class for holding returns from exec"
             def __init__(self):
@@ -102,9 +100,7 @@ class ProcPoolChild(AMPChild):
                     return to_pickle(self.returns, emptypickle=False) or ""
         _return = Ret()
 
-        available_vars = {'ev':ev,
-                          'inherits_from':utils.inherits_from,
-                          '_return':_return}
+        available_vars = {'_return':_return}
         if environment:
             # load environment
             try:
@@ -118,7 +114,7 @@ class ProcPoolChild(AMPChild):
         # try to execute with eval first
         try:
             ret = eval(source, {}, available_vars)
-            ret = to_pickle(ret, emptypickle=False) or ""
+            ret = _return.get_returns() or to_pickle(ret, emptypickle=False) or ""
         except Exception:
             # use exec instead
             exec source in available_vars