Skip to content

Fix the escape and unescape functions behaving differently from JavaScript #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wojiaoyishang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix the escape and unescape functions behaving differently from JavaScript #336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions js2py/host/jsfunctions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import re
from ..base import *
from six.moves.urllib.parse import quote, unquote

Expand Down Expand Up @@ -148,12 +149,27 @@ def isFinite(number):

@Js
def escape(text):
return quote(text.to_string().value)
def replacer(match):
char = match.group()
code = ord(char)
if code <= 0xff:
return f'%{code:02X}'
else:
return f'%u{code:04X}'
return re.sub(r'[^A-Za-z0-9@*_+\-./]', replacer, text.to_python())


@Js
def unescape(text):
return unquote(text.to_string().value)
def replacer(match):
u_group = match.group(1)
hex_group = match.group(2)
if u_group is not None:
return chr(int(u_group, 16))
elif hex_group is not None:
return chr(int(hex_group, 16))
return match.group()
return re.sub(r'%u([0-9A-Fa-f]{4})|%([0-9A-Fa-f]{2})', replacer, text.to_python(), flags=re.IGNORECASE)


@Js
Expand Down