diff options
| -rw-r--r-- | cherrypy/_cplogging.py | 2 | ||||
| -rw-r--r-- | cherrypy/_cpmodpy.py | 10 | ||||
| -rw-r--r-- | cherrypy/lib/cpstats.py | 2 | ||||
| -rw-r--r-- | cherrypy/test/webtest.py | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/cherrypy/_cplogging.py b/cherrypy/_cplogging.py index c6f185d8..091ce67d 100644 --- a/cherrypy/_cplogging.py +++ b/cherrypy/_cplogging.py @@ -213,7 +213,7 @@ class LogManager(object): See `the apache documentation <http://httpd.apache.org/docs/current/logs.html#combined>`_ for format details. - + CherryPy calls this automatically for you. Note there are no arguments; it collects the data itself from :class:`cherrypy.request<cherrypy._cprequest.Request>`. diff --git a/cherrypy/_cpmodpy.py b/cherrypy/_cpmodpy.py index a86519a1..cbb17652 100644 --- a/cherrypy/_cpmodpy.py +++ b/cherrypy/_cpmodpy.py @@ -35,11 +35,11 @@ Listen 8080 LoadModule python_module /usr/lib/apache2/modules/mod_python.so <Location "/"> - PythonPath "sys.path+['/path/to/my/application']" - SetHandler python-program - PythonHandler cherrypy._cpmodpy::handler - PythonOption cherrypy.setup myapp::setup_server - PythonDebug On + PythonPath "sys.path+['/path/to/my/application']" + SetHandler python-program + PythonHandler cherrypy._cpmodpy::handler + PythonOption cherrypy.setup myapp::setup_server + PythonDebug On </Location> # End diff --git a/cherrypy/lib/cpstats.py b/cherrypy/lib/cpstats.py index 7ec90622..3539507a 100644 --- a/cherrypy/lib/cpstats.py +++ b/cherrypy/lib/cpstats.py @@ -68,7 +68,7 @@ Each namespace, then, is a dict of named statistical values, such as good on a report: spaces and capitalization are just fine. In addition to scalars, values in a namespace MAY be a (third-layer) -dict, or a list, called a "collection". For example, the CherryPy +dict, or a list, called a "collection". For example, the CherryPy :class:`StatsTool` keeps track of what each request is doing (or has most recently done) in a 'Requests' collection, where each key is a thread ID; each value in the subdict MUST be a fourth dict (whew!) of statistical data about diff --git a/cherrypy/test/webtest.py b/cherrypy/test/webtest.py index a71e3a8d..9f991d76 100644 --- a/cherrypy/test/webtest.py +++ b/cherrypy/test/webtest.py @@ -120,13 +120,13 @@ class ReloadingTestLoader(TestLoader): for part in parts: obj = getattr(obj, part) - if type(obj) == types.ModuleType: + if isinstance(obj, types.ModuleType): return self.loadTestsFromModule(obj) elif (((py3k and isinstance(obj, type)) or isinstance(obj, (type, types.ClassType))) and issubclass(obj, TestCase)): return self.loadTestsFromTestCase(obj) - elif type(obj) == types.UnboundMethodType: + elif isinstance(obj, types.UnboundMethodType): if py3k: return obj.__self__.__class__(obj.__name__) else: |