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

Changeset 1018

Show
Ignore:
Timestamp:
03/27/06 01:31:36
Author:
fumanchu
Message:

Bugfix in Tree if cherrypy.root is None.

Files:

Legend:

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

    r970 r1018  
    2323        if "/" not in m: 
    2424            import cherrypy 
    25             if not isinstance(cherrypy.root, Root): 
     25            if cherrypy.root is not None and not isinstance(cherrypy.root, Root): 
    2626                m["/"] = cherrypy.root 
    2727        return m 
  • trunk/cherrypy/test/helper.py

    r1017 r1018  
    44"test.py" (in this folder); test.py calls this module as a library. 
    55 
    6 Usage: 
    7     Each individual test_*.py module imports this module (helper), 
    8     usually to make an instance of CPWebCase, and then call testmain(). 
    9      
    10     The CP test suite script (test.py) imports this module and calls 
    11     run_test_suite, possibly more than once. CP applications may also 
    12     import test.py (to use TestHarness), which then calls helper.py. 
     6Usage 
     7===== 
     8Each individual test_*.py module imports this module (helper), 
     9usually to make an instance of CPWebCase, and then call testmain(). 
     10 
     11The CP test suite script (test.py) imports this module and calls 
     12run_test_suite, possibly more than once. CP applications may also 
     13import test.py (to use TestHarness), which then calls helper.py. 
    1314""" 
    1415 
  • trunk/cherrypy/test/test.py

    r1017 r1018  
    254254         
    255255        if self.profile: 
     256            conf = conf or {} 
    256257            conf['profiling.on'] = True 
    257258         

Hosted by WebFaction

Log in as guest/cpguest to create tickets