From 77e718c3ffb30473759a8b1ed347f73cb2ff5cfe Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Tue, 15 Mar 2022 08:37:31 -0700
Subject: [PATCH] Revert "Fix bug with percentage redirects, close #1650"

This reverts commit c85d669de387b40e667fd6942c6cc1c15b4f5964.

Refs #1658
---
 datasette/utils/__init__.py | 7 +------
 tests/test_html.py          | 4 ----
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/datasette/utils/__init__.py b/datasette/utils/__init__.py
index e7c9fb1c..79feeef6 100644
--- a/datasette/utils/__init__.py
+++ b/datasette/utils/__init__.py
@@ -10,7 +10,6 @@ import markupsafe
 import mergedeep
 import os
 import re
-import secrets
 import shlex
 import tempfile
 import typing
@@ -1173,8 +1172,4 @@ def dash_encode(s: str) -> str:
 @documented
 def dash_decode(s: str) -> str:
     "Decodes a dash-encoded string, so ``-2Ffoo-2Fbar`` -> ``/foo/bar``"
-    # Avoid accidentally decoding a %2f style sequence
-    temp = secrets.token_hex(16)
-    s = s.replace("%", temp)
-    decoded = urllib.parse.unquote(s.replace("-", "%"))
-    return decoded.replace(temp, "%")
+    return urllib.parse.unquote(s.replace("-", "%"))
diff --git a/tests/test_html.py b/tests/test_html.py
index 55d78c05..de703284 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -961,10 +961,6 @@ def test_no_alternate_url_json(app_client, path):
             "/fivethirtyeight/twitter-ratio%2Fsenators",
             "/fivethirtyeight/twitter-2Dratio-2Fsenators",
         ),
-        (
-            "/fixtures/table%2Fwith%2Fslashes",
-            "/fixtures/table-2Fwith-2Fslashes",
-        ),
         # query string should be preserved
         ("/foo/bar%2Fbaz?id=5", "/foo/bar-2Fbaz?id=5"),
     ),