Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
cython
Commits
67ebd9f7
Commit
67ebd9f7
authored
Sep 09, 2010
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
check for non-ASCII bytes literals only in Py3 mode
parent
9c76f112
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
Cython/Compiler/Parsing.py
Cython/Compiler/Parsing.py
+7
-4
No files found.
Cython/Compiler/Parsing.py
View file @
67ebd9f7
...
@@ -698,6 +698,7 @@ def p_string_literal(s, kind_override=None):
...
@@ -698,6 +698,7 @@ def p_string_literal(s, kind_override=None):
# s.sy == 'BEGIN_STRING'
# s.sy == 'BEGIN_STRING'
pos
=
s
.
position
()
pos
=
s
.
position
()
is_raw
=
0
is_raw
=
0
is_python3_source
=
s
.
context
.
language_level
>=
3
has_non_ASCII_literal_characters
=
False
has_non_ASCII_literal_characters
=
False
kind
=
s
.
systring
[:
1
].
lower
()
kind
=
s
.
systring
[:
1
].
lower
()
if
kind
==
'r'
:
if
kind
==
'r'
:
...
@@ -726,7 +727,7 @@ def p_string_literal(s, kind_override=None):
...
@@ -726,7 +727,7 @@ def p_string_literal(s, kind_override=None):
#print "p_string_literal: sy =", sy, repr(s.systring) ###
#print "p_string_literal: sy =", sy, repr(s.systring) ###
if
sy
==
'CHARS'
:
if
sy
==
'CHARS'
:
chars
.
append
(
systr
)
chars
.
append
(
systr
)
if
not
has_non_ASCII_literal_characters
and
check_for_non_ascii_characters
(
systr
):
if
is_python3_source
and
not
has_non_ASCII_literal_characters
and
check_for_non_ascii_characters
(
systr
):
has_non_ASCII_literal_characters
=
True
has_non_ASCII_literal_characters
=
True
elif
sy
==
'ESCAPE'
:
elif
sy
==
'ESCAPE'
:
if
is_raw
:
if
is_raw
:
...
@@ -738,7 +739,8 @@ def p_string_literal(s, kind_override=None):
...
@@ -738,7 +739,8 @@ def p_string_literal(s, kind_override=None):
chars
.
append
(
u"'"
)
chars
.
append
(
u"'"
)
else
:
else
:
chars
.
append
(
systr
)
chars
.
append
(
systr
)
if
not
has_non_ASCII_literal_characters
and
check_for_non_ascii_characters
(
systr
):
if
is_python3_source
and
not
has_non_ASCII_literal_characters
\
and
check_for_non_ascii_characters
(
systr
):
has_non_ASCII_literal_characters
=
True
has_non_ASCII_literal_characters
=
True
else
:
else
:
c
=
systr
[
1
]
c
=
systr
[
1
]
...
@@ -765,7 +767,8 @@ def p_string_literal(s, kind_override=None):
...
@@ -765,7 +767,8 @@ def p_string_literal(s, kind_override=None):
chars
.
append_uescape
(
chrval
,
systr
)
chars
.
append_uescape
(
chrval
,
systr
)
else
:
else
:
chars
.
append
(
u'
\
\
'
+
systr
[
1
:])
chars
.
append
(
u'
\
\
'
+
systr
[
1
:])
if
not
has_non_ASCII_literal_characters
and
check_for_non_ascii_characters
(
systr
):
if
is_python3_source
and
not
has_non_ASCII_literal_characters
\
and
check_for_non_ascii_characters
(
systr
):
has_non_ASCII_literal_characters
=
True
has_non_ASCII_literal_characters
=
True
elif
sy
==
'NEWLINE'
:
elif
sy
==
'NEWLINE'
:
chars
.
append
(
u'
\
n
'
)
chars
.
append
(
u'
\
n
'
)
...
@@ -784,7 +787,7 @@ def p_string_literal(s, kind_override=None):
...
@@ -784,7 +787,7 @@ def p_string_literal(s, kind_override=None):
error
(
pos
,
u"invalid character literal: %r"
%
bytes_value
)
error
(
pos
,
u"invalid character literal: %r"
%
bytes_value
)
else
:
else
:
bytes_value
,
unicode_value
=
chars
.
getstrings
()
bytes_value
,
unicode_value
=
chars
.
getstrings
()
if
has_non_ASCII_literal_characters
and
s
.
context
.
language_level
>=
3
:
if
is_python3_source
and
has_non_ASCII_literal_characters
:
# Python 3 forbids literal non-ASCII characters in byte strings
# Python 3 forbids literal non-ASCII characters in byte strings
if
kind
!=
'u'
:
if
kind
!=
'u'
:
s
.
error
(
"bytes can only contain ASCII literal characters."
,
pos
=
pos
)
s
.
error
(
"bytes can only contain ASCII literal characters."
,
pos
=
pos
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment