[pypy-svn] r18076 - in pypy/dist/pypy/translator: goal tool

[pedronis at codespeak.net]

Author: pedronis
Date: Sat Oct  1 23:27:27 2005
New Revision: 18076

Modified:
   pypy/dist/pypy/translator/goal/translate_pypy.py
   pypy/dist/pypy/translator/tool/graphserver.py
Log:
small cleanup



Modified: pypy/dist/pypy/translator/goal/translate_pypy.py
==============================================================================
--- pypy/dist/pypy/translator/goal/translate_pypy.py	(original)
+++ pypy/dist/pypy/translator/goal/translate_pypy.py	Sat Oct  1 23:27:27 2005
@@ -215,23 +215,19 @@
     class ServerSetup:
         async_server = None
         
-        def __call__(self, port=None):
+        def __call__(self, port=None, async_only=False):
             if self.async_server is not None:
                 return self.async_server
-            elif options.graphserve or port is not None:
-                if options.graphserve is None:
-                    options.graphserve = port
+            elif port is not None:
                 from pypy.translator.tool.graphserver import run_async_server
-                serv_start, serv_show, serv_stop = self.async_server = run_async_server(t, options)
+                serv_start, serv_show, serv_stop = self.async_server = run_async_server(t, options, port)
                 return serv_start, serv_show, serv_stop
-            else:
+            elif not async_only:
                 from pypy.translator.tool.graphserver import run_server_for_inprocess_client
                 return run_server_for_inprocess_client(t, options)
 
     server_setup = ServerSetup()
-    if options.graphserve:
-        server_setup()
-
+    server_setup(options.graphserve, async_only=True)
 
     pdb_plus_show = PdbPlusShow(t) # need a translator to support extended commands
 

Modified: pypy/dist/pypy/translator/tool/graphserver.py
==============================================================================
--- pypy/dist/pypy/translator/tool/graphserver.py	(original)
+++ pypy/dist/pypy/translator/tool/graphserver.py	Sat Oct  1 23:27:27 2005
@@ -10,10 +10,10 @@
 send_msg = portutil.send_msg
 recv_msg = portutil.recv_msg
 
-def run_async_server(t, options):
+def run_async_server(t, options, port):
     import graphpage
     homepage = graphpage.TranslatorPage(t, options.huge)
-    return run_server(homepage, port=options.graphserve, background=True)
+    return run_server(homepage, port=port, background=True)
 
 class GraphserverPort(portutil.Port):