diff options
author | Gustavo Picon <tabo@tabo.pe> | 2014-01-12 20:04:16 -0500 |
---|---|---|
committer | Gustavo Picon <tabo@tabo.pe> | 2014-01-12 20:04:16 -0500 |
commit | 89b473735d830a1eda091da5f726ea74a110f7ea (patch) | |
tree | 07c1716a9c20b3366ce70d1b8932a44eb69e8ea1 /cherrypy/test/logtest.py | |
parent | ebbf43f5ff35c39d5f936b47a5a68d54eaaf27cf (diff) | |
download | cherrypy-git-89b473735d830a1eda091da5f726ea74a110f7ea.tar.gz |
More PEP8 work.
Diffstat (limited to 'cherrypy/test/logtest.py')
-rw-r--r-- | cherrypy/test/logtest.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/cherrypy/test/logtest.py b/cherrypy/test/logtest.py index 3482c9ec..cc59499a 100644 --- a/cherrypy/test/logtest.py +++ b/cherrypy/test/logtest.py @@ -54,7 +54,9 @@ class LogCase(object): if not self.interactive: raise self.failureException(msg) - p = " Show: [L]og [M]arker [P]attern; [I]gnore, [R]aise, or sys.e[X]it >> " + p = (" Show: " + "[L]og [M]arker [P]attern; " + "[I]gnore, [R]aise, or sys.e[X]it >> ") sys.stdout.write(p + ' ') # ARGH sys.stdout.flush() @@ -100,8 +102,8 @@ class LogCase(object): key = str(time.time()) self.lastmarker = key - open(self.logfile, 'ab+').write(ntob("%s%s\n" % - (self.markerPrefix, key), "utf-8")) + open(self.logfile, 'ab+').write( + ntob("%s%s\n" % (self.markerPrefix, key), "utf-8")) def _read_marked_region(self, marker=None): """Return lines from self.logfile in the marked region. @@ -175,7 +177,11 @@ class LogCase(object): if lines not in data[sliceargs]: msg = "%r not found on log line %r" % (lines, sliceargs) self._handleLogError( - msg, [data[sliceargs], "--EXTRA CONTEXT--"] + data[sliceargs + 1:sliceargs + 6], marker, lines) + msg, + [data[sliceargs], "--EXTRA CONTEXT--"] + data[ + sliceargs + 1:sliceargs + 6], + marker, + lines) else: # Multiple args. Use __getslice__ and require lines to be list. if isinstance(lines, tuple): |