From e5f28fd2b1ad9a0a906f31c4b9afb0d5f969c418 Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Sat, 9 Sep 2023 10:56:40 +0200 Subject: [PATCH] - lint fixes --- src/OFS/Application.py | 4 ++-- src/OFS/tests/testApplication.py | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/OFS/Application.py b/src/OFS/Application.py index 5147894b7f..2b3212d3fe 100644 --- a/src/OFS/Application.py +++ b/src/OFS/Application.py @@ -128,8 +128,8 @@ def getZMIMainFrameTarget(self, REQUEST): # Only allow a passed-in ``came_from`` URL if it is local (just a path) # or if the URL scheme and hostname are the same as our own if (not parsed_came_from.scheme and not parsed_came_from.netloc) or \ - (parsed_parent_url.scheme == parsed_came_from.scheme and - parsed_parent_url.netloc == parsed_came_from.netloc): + (parsed_parent_url.scheme == parsed_came_from.scheme + and parsed_parent_url.netloc == parsed_came_from.netloc): return came_from return default diff --git a/src/OFS/tests/testApplication.py b/src/OFS/tests/testApplication.py index 24a6005270..462e89c3b7 100644 --- a/src/OFS/tests/testApplication.py +++ b/src/OFS/tests/testApplication.py @@ -1,5 +1,4 @@ import unittest -from urllib.parse import urlparse from Testing.ZopeTestCase import FunctionalTestCase @@ -128,7 +127,6 @@ def test_getZMIMainFrameTarget(self): for URL1 in ('http://nohost', 'https://nohost/some/path'): request = {'URL1': URL1} - parsed_url1 = urlparse(URL1) # No came_from at all self.assertEqual(app.getZMIMainFrameTarget(request), @@ -145,7 +143,7 @@ def test_getZMIMainFrameTarget(self): # Local (path only) came_from request['came_from'] = '/new/path' self.assertEqual(app.getZMIMainFrameTarget(request), - f'/new/path') + '/new/path') # came_from URL outside our own server request['came_from'] = 'https://www.zope.dev/index.html'