github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Tilde encoding now encodes space as plus, closes #1701

Browse source 
Refs #1657
This commit is contained in:
Simon Willison 2022-04-06 08:55:01 -07:00
commit 90d1be9952
4 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
datasette/utils/__init__.py
View file

@ -1113,12 +1113,20 @@ _TILDE_ENCODING_SAFE = frozenset(
# '.' and '~'
)
_space = ord(" ")
class TildeEncoder(dict):
# Keeps a cache internally, via __missing__
def __missing__(self, b):
print("b is ", b)
# Handle a cache miss, store encoded string in cache and return.
res = chr(b) if b in _TILDE_ENCODING_SAFE else "~{:02X}".format(b)
if b in _TILDE_ENCODING_SAFE:
res = chr(b)
elif b == _space:
res = "+"
else:
res = "~{:02X}".format(b)
self[b] = res
return res
@ -1138,7 +1146,7 @@ def tilde_decode(s: str) -> str:
# Avoid accidentally decoding a %2f style sequence
temp = secrets.token_hex(16)
s = s.replace("%", temp)
decoded = urllib.parse.unquote(s.replace("~", "%"))
decoded = urllib.parse.unquote_plus(s.replace("~", "%"))
return decoded.replace(temp, "%")