kennethreitz/pipenv
1
0
Fork 0
mirror of https://github.com/kennethreitz/pipenv.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix unicode for py2

Browse Source
This commit is contained in:
frostming
2018-11-06 16:56:27 +08:00
parent 3dcd206068
commit 4972248e33
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pipenv/patched/prettytoml/tokens/toml2py.py
+1
View File
@@ -40,6 +40,7 @@ def _unescape_str(text):
"""
Unescapes a string according the TOML spec. Raises BadEscapeCharacter when appropriate.
"""
text = text.decode('utf-8') if isinstance(text, six.binary_type) else text
tokens = []
i = 0
basicstr_re = re.compile(r'[^"\\\000-\037]*')
tasks/vendoring/patches/patched/prettytoml-unicode.patch
+12 -11
View File
@@ -1,5 +1,5 @@
diff --git a/pipenv/patched/prettytoml/tokens/py2toml.py b/pipenv/patched/prettytoml/tokens/py2toml.py
index 8299195..2decd02 100644
index 82991958..2decd021 100644
--- a/pipenv/patched/prettytoml/tokens/py2toml.py
+++ b/pipenv/patched/prettytoml/tokens/py2toml.py
@@ -2,6 +2,7 @@
@@ -11,8 +11,8 @@ index 8299195..2decd02 100644
import datetime
import six
@@ -81,10 +82,30 @@ def create_string_token(text, bare_string_allowed=False, multiline_strings_allow
def _escape_single_line_quoted_string(text):
- if six.PY2:
- return text.encode('unicode-escape').encode('string-escape').replace('"', '\\"').replace("\\'", "'")
@@ -42,11 +42,11 @@ index 8299195..2decd02 100644
+
+ flush()
+ return ''.join(res)
def _create_multiline_string_token(text):
diff --git a/pipenv/patched/prettytoml/tokens/toml2py.py b/pipenv/patched/prettytoml/tokens/toml2py.py
index 2bf9c1c..98186ca 100644
index 2bf9c1c2..56804437 100644
--- a/pipenv/patched/prettytoml/tokens/toml2py.py
+++ b/pipenv/patched/prettytoml/tokens/toml2py.py
@@ -1,3 +1,4 @@
@@ -55,15 +55,15 @@ index 2bf9c1c..98186ca 100644
import string
import iso8601
@@ -19,7 +20,7 @@ def deserialize(token):
Raises DeserializationError when appropriate.
"""
-
-
+
if token.type == TYPE_BOOLEAN:
return _to_boolean(token)
elif token.type == TYPE_INTEGER:
@@ -39,42 +40,39 @@ def _unescape_str(text):
@@ -39,42 +40,40 @@ def _unescape_str(text):
"""
Unescapes a string according the TOML spec. Raises BadEscapeCharacter when appropriate.
"""
@@ -94,6 +94,7 @@ index 2bf9c1c..98186ca 100644
- def escape_unicode_char(x):
- if six.PY2:
- return x.encode('unicode-escape')
+ text = text.decode('utf-8') if isinstance(text, six.binary_type) else text
+ tokens = []
+ i = 0
+ basicstr_re = re.compile(r'[^"\\\000-\037]*')
@@ -135,6 +136,6 @@ index 2bf9c1c..98186ca 100644
+ tokens.append(escapes[text[i]])
+ i += 1
+ return ''.join(tokens)
def _to_string(token):