remove_prefix method working same for all python versions

jazzband · Feb 21, 2023 · a4b3f9f · a4b3f9f
1 parent d90dfa8
commit a4b3f9f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/defender/tests.py b/defender/tests.py
@@ -1176,3 +1176,6 @@ def test_remove_prefix(self):
             "defender:blocked:ip:192.168.24.24", "defender:blocked:"), "ip:192.168.24.24")
         self.assertEqual(utils.remove_prefix(
             "defender:blocked:username:johndoe", "defender:blocked:"), "username:johndoe")
+        self.assertEqual(utils.remove_prefix(
+            "defender:blocked:username:johndoe", "blocked:username:"),
+            "defender:blocked:username:johndoe")
diff --git a/defender/utils.py b/defender/utils.py
@@ -129,14 +129,10 @@ def get_username_blocked_cache_key(username):
 
 
 def remove_prefix(string, prefix):
+    if string.startswith(prefix):
+        return string[len(prefix):]
+    return string
 
-    # backwards compatibility for str.removeprefix for python < 3.9
-    if sys.version_info < (3, 9):
-        if string.startswith(prefix):
-            return string[len(prefix) :]
-        return string
-
-    return string.removeprefix(prefix)
 
 
 def strip_keys(key_list):