Changeset 41

Timestamp:

02/11/06 00:05:14

Author:

fumanchu

Message:

Backward-incompatible changes from modpython ML discussion:

1. The "import" PythonOption? is removed in favor of PythonFixupHandler? declarations.
   
2. The "application" PythonOption? has been renamed "wsgi.application", to help with PythonOption? namespace issues.
   
3. The "profile" function has been removed.
   

Files:

• modpython_gateway.py (modified) (2 diffs)

modpython_gateway.py

@@ -7 +7 @@
-<Location /mcontrol>
-    SetHandler python-program
+    PythonFixupHandler mcontrol.cherry::startup
-    PythonHandler modpython_gateway::handler
-
-
+
-</Location>
-
@@ -164 +164 @@
-
-
-_counter = 0
-
-def profile(req):
-    # Call this function instead of "handler"
-    # to get profiling data for each call.
-    import hotshot, os.path
-    global _counter
-    _counter += 1
-    ppath = os.path.join(os.path.dirname(__file__), "cp_%s.prof" % _counter)
-    prof = hotshot.Profile(ppath)
-    prof.runcall(handler, req)
-    prof.close()
-    return apache.OK
-
-def handler(req):
-    # If you use a PythonImport directive as recommended, its interpreter_name
-    # value must EXACTLY match the value of req.interpreter (case-sensitive).
-    # You can un-comment the next line to get the value of req.interpreter.
-##  raise StandardError(repr(req.interpreter))
-    
-    config = req.get_config()
-    debug = int(config.get("PythonDebug", 0))
-    
-    options = req.get_options()
-    
-    # Because PythonImport cannot be specified per Directory or Location,
-    # take any 'import' PythonOption's and import them. If a function name
-    # in that module is provided (after the "::"), it will be called with
-    # the request as an argument. The module and function, if any, should
-    # be re-entrant (i.e., handle multiple threads), and, since they will
-    # be called per request, must be designed to run setup code only on the
-    # first request (a global 'first_request' flag is usually enough).
-    import_opt = options.get('import')
-    if import_opt:
-        atoms = import_opt.split('::', 1)
-        modname = atoms.pop(0)
-        module = __import__(modname, globals(), locals(), [''])
-        if atoms:
-            func = getattr(module, atoms[0])
-            func(req)
-    
-    # Import the wsgi 'application' callable and pass it to Handler.run
-options['
+req.get_options()['wsgi.
-    module = __import__(modname, globals(), locals(), [''])
-    app = getattr(module, objname)