[pypy-svn] r41320 - pypy/dist/pypy/tool/build/web

guido at codespeak.net guido at codespeak.net
Mon Mar 26 12:22:43 CEST 2007


Author: guido
Date: Mon Mar 26 12:22:41 2007
New Revision: 41320

Modified:
   pypy/dist/pypy/tool/build/web/app.py
Log:
Using the compile_config from tool/build/config.py instead of the 'raw' PyPy
config to find out what options were given in the web tool build page (somewhat
untested).


Modified: pypy/dist/pypy/tool/build/web/app.py
==============================================================================
--- pypy/dist/pypy/tool/build/web/app.py	(original)
+++ pypy/dist/pypy/tool/build/web/app.py	Mon Mar 26 12:22:41 2007
@@ -46,14 +46,15 @@
     from pypy.config.pypyoption import get_pypy_config
     from pypy.config.config import Config
     from pypy.translator.driver import DEFAULTS
-    config = get_pypy_config(DEFAULTS, translating=True)
-    def add(config, path_upto_here="", outermost=False):
+    #config = get_pypy_config(DEFAULTS, translating=True)
+    cconfig = config.compile_config.copy()
+    def add(cconfig, path_upto_here="", outermost=False):
         items = []
         children = [(child._name, child)
-                    for child in config._cfgimpl_descr._children]
+                    for child in cconfig._cfgimpl_descr._children]
         children.sort()
         for name, child in children:
-            value_default = getattr(config, name)
+            value_default = getattr(cconfig, name)
             if path_upto_here:
                 subpath = path_upto_here + "." + name
             else:
@@ -78,7 +79,7 @@
         if outermost and not lines:
             return ""
         return "\n  ".join(items)
-    return "<ul> %s </ul>" % (add(config, outermost=False), )
+    return "<ul> %s </ul>" % (add(cconfig, outermost=False), )
 
 class ServerPage(object):
     """ base class for pages that communicate with the server
@@ -355,7 +356,6 @@
         # be found, this page will raise an exception)
         return LogPage(name, self.config, self.gateway)
 
-
 class LogPage(ServerPage):
     def __init__(self, buildid, config, gateway=None):
         super(LogPage, self).__init__(config, gateway)



More information about the Pypy-commit mailing list