Merge 13c1b19 into d5b3b3d

zopefoundation · May 15, 2020 · 8a09d7a · 8a09d7a
2 parents d5b3b3d + 13c1b19
commit 8a09d7a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/ZPublisher/tests/testHTTPResponse.py b/src/ZPublisher/tests/testHTTPResponse.py
@@ -1243,8 +1243,8 @@ def test___str__after_expireCookie(self):
         response.expireCookie('qux', path='/')
         result = bytes(response)
         lines = result.split(b'\r\n')
-        cookie_line = [l for l in lines if b'Set-Cookie' in l][0]
-        other_lines = [l for l in lines if b'Set-Cookie' not in l]
+        cookie_line = [line for line in lines if b'Set-Cookie' in line][0]
+        other_lines = [line for line in lines if b'Set-Cookie' not in line]
         self.assertEqual(len(lines), 6)
         expected = {
             b'Status: 200 OK',

diff --git a/src/Zope2/utilities/zconsole.py b/src/Zope2/utilities/zconsole.py
@@ -38,9 +38,9 @@ def main(args=sys.argv):
     import argparse
     parser = argparse.ArgumentParser(description='Zope console')
     parser.add_argument(
-            'mode',
-            choices=['run', 'debug'],
-            help='mode of operation, run: run script; debug: interactive console')  # noqa: E501
+        'mode',
+        choices=['run', 'debug'],
+        help='mode of operation, run: run script; debug: interactive console')  # noqa: E501
     parser.add_argument('zopeconf', help='path to zope.conf')
     parser.add_argument('scriptargs', nargs=argparse.REMAINDER)
     namespace, unused = parser.parse_known_args(args[1:])