Download Install Tutorial Docs FAQ Tools WikiLicense Team IRC Planet Involvement Shop Book

Changeset 1669

Show
Ignore:
Timestamp:
06/16/07 19:08:55
Author:
fumanchu
Message:

Oops. Fix for [1659].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/cherrypy/__init__.py

    r1667 r1669  
    340340    if isinstance(thing, _ThreadLocalProxy): 
    341341        thing = getattr(serving, thing.__attrname__) 
    342     return pydoc._builtin_resolve(thing, forceload) 
     342    return _pydoc._builtin_resolve(thing, forceload) 
    343343 
    344344try: 
    345     import pydoc 
    346     pydoc._builtin_resolve = pydoc.resolve 
    347     pydoc.resolve = _cherrypy_pydoc_resolve 
    348     del pydoc 
     345    import pydoc as _pydoc 
     346    _pydoc._builtin_resolve = _pydoc.resolve 
     347    _pydoc.resolve = _cherrypy_pydoc_resolve 
    349348except ImportError: 
    350349    pass 

Hosted by WebFaction

Log in as guest/cpguest to create tickets