Fix compatibility with Python 2.7 (#163)

* Fix compatibility with Python 2.7 * changelog
plone · Oct 1, 2023 · d5dea80 · d5dea80
1 parent 0958370
commit d5dea80
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/news/162.bugfix b/news/162.bugfix
@@ -0,0 +1 @@
+Fix compatibility with Python 2.7. @davisagli
diff --git a/src/plone/rest/tests/test_traversal.py b/src/plone/rest/tests/test_traversal.py
@@ -118,7 +118,7 @@ def test_html_request_via_double_apis_raises_redirect(self):
             self.traverse(path="/plone/++api++/++api++", accept="text/html")
         self.assertEqual(
             exc.exception.headers["Location"],
-            f"{portal_url}/++api++",
+            "{}/++api++".format(portal_url),
         )
 
     def test_html_request_via_multiple_apis_raises_redirect(self):
@@ -129,7 +129,7 @@ def test_html_request_via_multiple_apis_raises_redirect(self):
             )
         self.assertEqual(
             exc.exception.headers["Location"],
-            f"{portal_url}/++api++/search",
+            "{}/++api++/search".format(portal_url),
         )
 
     def test_html_request_via_multiple_bad_apis_raises_not_found(self):

diff --git a/src/plone/rest/traverse.py b/src/plone/rest/traverse.py
@@ -69,8 +69,8 @@ def traverse(self, name_ignored, subpath_ignored):
         url = self.request.ACTUAL_URL
         if url.count(name) > 1:
             # Redirect to proper url.
-            while f"{name}{name}" in url:
-                url = url.replace(f"{name}{name}", name)
+            while name + name in url:
+                url = url.replace(name + name, name)
             if url.count(name) > 1:
                 # Something like: .../++api++/something/++api++
                 # Return nothing, so a NotFound is raised.