iSharkFly-Open
/
python-peps
mirror of https://github.com/python/peps.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pep 508 parser fixes (#443) 

Fix 1 bug. Enhance handling of trailing whitespace for URLs. Correct spelling.

Add tests.
This commit is contained in:
Michael Laing 2017-12-04 18:41:34 -05:00 committed by Guido van Rossum
parent f1252a2f4e
commit c276a04e3b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pep-0508.txt
View File

@ -356,7 +356,7 @@ Complete Grammar
The complete parsley grammar:: The complete parsley grammar::
wsp = ' ' | '\t' wsp = ' ' | '\t'
version_cmp = wsp* <'<' | '<=' | '!=' | '==' | '>=' | '>' | '~=' | '==='> version_cmp = wsp* <'<=' | '<' | '!=' | '==' | '>=' | '>' | '~=' | '==='>
version = wsp* <( letterOrDigit | '-' | '_' | '.' | '*' | '+' | '!' )+> version = wsp* <( letterOrDigit | '-' | '_' | '.' | '*' | '+' | '!' )+>
version_one = version_cmp:op version:v wsp* -> (op, v) version_one = version_cmp:op version:v wsp* -> (op, v)
version_many = version_one:v1 (wsp* ',' version_one)*:v2 -> [v1] + v2 version_many = version_one:v1 (wsp* ',' version_one)*:v2 -> [v1] + v2
@ -394,7 +394,7 @@ The complete parsley grammar::
extras = '[' wsp* extras_list?:e wsp* ']' -> e extras = '[' wsp* extras_list?:e wsp* ']' -> e
name_req = (name:n wsp* extras?:e wsp* versionspec?:v wsp* quoted_marker?:m name_req = (name:n wsp* extras?:e wsp* versionspec?:v wsp* quoted_marker?:m
-> (n, e or [], v or [], m)) -> (n, e or [], v or [], m))
url_req = (name:n wsp* extras?:e wsp* urlspec:v wsp+ quoted_marker?:m url_req = (name:n wsp* extras?:e wsp* urlspec:v (wsp+ | end) quoted_marker?:m
-> (n, e or [], v, m)) -> (n, e or [], v, m))
specification = wsp* ( url_req | name_req ):s wsp* -> s specification = wsp* ( url_req | name_req ):s wsp* -> s
# The result is a tuple - name, list-of-extras, # The result is a tuple - name, list-of-extras,
@ -426,7 +426,7 @@ The complete parsley grammar::
| ( ( h16 ':'){0,6} h16 )? '::' ) | ( ( h16 ':'){0,6} h16 )? '::' )
h16 = hexdig{1,4} h16 = hexdig{1,4}
ls32 = ( h16 ':' h16) | IPv4address ls32 = ( h16 ':' h16) | IPv4address
IPv4address = dec_octet '.' dec_octet '.' dec_octet '.' Dec_octet IPv4address = dec_octet '.' dec_octet '.' dec_octet '.' dec_octet
nz = ~'0' digit nz = ~'0' digit
dec_octet = ( dec_octet = (
digit # 0-9 digit # 0-9
@ -476,8 +476,10 @@ A test program - if the grammar is in a string ``grammar``::
"A.B-C_D", "A.B-C_D",
"aa", "aa",
"name", "name",
"name<=1"
"name>=3", "name>=3",
"name>=3,<2", "name>=3,<2",
"name@http://foo.com",
"name [fred,bar] @ http://foo.com ; python_version=='2.7'", "name [fred,bar] @ http://foo.com ; python_version=='2.7'",
"name[quux, strange];python_version<'2.7' and platform_version=='2'", "name[quux, strange];python_version<'2.7' and platform_version=='2'",
"name; os_name=='a' or os_name=='b'", "name; os_name=='a' or os_name=='b'",