[Commit-gnuradio] r7745 - grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python

[jblum]

Author: jblum
Date: 2008-02-19 17:36:18 -0700 (Tue, 19 Feb 2008)
New Revision: 7745

Modified:
   grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/FlowGraph.py
Log:
some fixes

Modified: 
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/FlowGraph.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/FlowGraph.py    
2008-02-19 18:52:28 UTC (rev 7744)
+++ grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/FlowGraph.py    
2008-02-20 00:36:18 UTC (rev 7745)
@@ -24,6 +24,12 @@
 from Block import Block
 from Connection import Connection
 
+from gnuradio import gr
+from gnuradio import blks2
+from gnuradio.gr import firdes
+import math
+import cmath
+
 class FlowGraph(_FlowGraph):
        
        def evaluate(self, expr):
@@ -33,14 +39,8 @@
                @throw Exception bad expression
                @return the evaluated data
                """
-               namespace = dict()      
-               namespace['__builtins__'] = __builtins__        
-               #bring in gnuradio modules
-               from gnuradio import gr
-               from gnuradio import blks2
-               from gnuradio.gr import firdes
-               import math
-               import cmath
+               namespace = dict()
+               namespace['__builtins__'] = __builtins__                
                namespace['gr'] = gr
                namespace['blks2'] = blks2
                namespace['firdes'] = firdes
@@ -48,8 +48,10 @@
                namespace['cmath'] = cmath
                #load variables
                for block in filter(lambda b: 
b.get_key().startswith('variable'), self.get_blocks()):
-                       try: namespace[block.get_id()] = eval(block.get_fcn(), 
{}, {})
+                       try: 
+                               e = eval(block.get_fcn(), {}, {})
+                               namespace[block.get_id()] = e
                        except: pass
-               return eval(expr, namespace, {})        
-       
+               e = eval(expr, namespace, {})
+               return e