Changeset 1601

Timestamp:

01/20/07 02:00:25

Author:

fumanchu

Message:

Bah. I meant to fix help(cherrypy.request) all along for CP 3 final and never got around to it. Here it is, finally; had to monkeypatch pydoc.resolve.

Files:

• trunk/cherrypy/__init__.py (modified) (1 diff)

trunk/cherrypy/__init__.py

@@ -102 +102 @@
-# Create thread_data object as a thread-specific all-purpose storage
-thread_data = _local()
+
+
+# Monkeypatch pydoc to allow help() to go through the threadlocal proxy.
+# Jan 2007: no Googleable examples of anyone else replacing pydoc.resolve.
+# The only other way would be to change what is returned from type(request)
+# and that's not possible in pure Python (you'd have to fake ob_type).
+def _cherrypy_pydoc_resolve(thing, forceload=0):
+    """Given an object or a path to an object, get the object and its name."""
+    if isinstance(thing, _ThreadLocalProxy):
+        thing = thing._get_child()
+    return pydoc._builtin_resolve(thing, forceload)
+
+try:
+    import pydoc
+    pydoc._builtin_resolve = pydoc.resolve
+    pydoc.resolve = _cherrypy_pydoc_resolve
+except ImportError:
+    pass
-
-