From 13753dd7993962ae3601d6bd64f9a2227d969504 Mon Sep 17 00:00:00 2001 From: Deimos Date: Tue, 11 Dec 2018 16:13:38 -0700 Subject: [PATCH] Remove now-unnecessary un-escaping of ~ in urls I had blamed Pyramid for this, but the fault was actually in Python's stdlib. Python 3.7 fixes it, so this is no longer necessary: https://docs.python.org/3/whatsnew/3.7.html#urllib-parse --- tildes/tildes/__init__.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tildes/tildes/__init__.py b/tildes/tildes/__init__.py index 3c5bb8f..185ff8a 100644 --- a/tildes/tildes/__init__.py +++ b/tildes/tildes/__init__.py @@ -161,10 +161,7 @@ def current_listing_base_url( if query: query_vars.update(query) - url = request.current_route_url(_query=query_vars) - - # Pyramid seems to %-encode tilde characters unnecessarily, fix that - return url.replace("%7E", "~") + return request.current_route_url(_query=query_vars) def current_listing_normal_url( @@ -197,7 +194,4 @@ def current_listing_normal_url( if query: query_vars.update(query) - url = request.current_route_url(_query=query_vars) - - # Pyramid seems to %-encode tilde characters unnecessarily, fix that - return url.replace("%7E", "~") + return request.current_route_url(_query=query_vars)