M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

hack-patch pythonparser for python 3.8

This commit is contained in:
Sebastien Bourdeauducq 2020-07-28 10:46:29 +08:00
parent 4ef1b6e76d
commit 454c3d806c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq-fast/pkgs/python-deps.nix
View File

@ -35,7 +35,7 @@ rec {
rev = "5b391fe86f43bb9f4f96c5bc0532e2a112db2936"; rev = "5b391fe86f43bb9f4f96c5bc0532e2a112db2936";
sha256 = "1gw1fk4y2l6bwq0fg2a9dfc1rvq8cv492dyil96amjdhsxvnx35b"; sha256 = "1gw1fk4y2l6bwq0fg2a9dfc1rvq8cv492dyil96amjdhsxvnx35b";
}; };
patches = [ ./python37hack.patch ]; patches = [ ./pythonparserver.patch ];
propagatedBuildInputs = with python3Packages; [ regex ]; propagatedBuildInputs = with python3Packages; [ regex ];
}; };

12
artiq-fast/pkgs/python37hack.patch → artiq-fast/pkgs/pythonparserver.patch
View File

@ -1,25 +1,27 @@
diff --git a/pythonparser/lexer.py b/pythonparser/lexer.py diff --git a/pythonparser/lexer.py b/pythonparser/lexer.py
index a62eaf1..2c48d36 100644 index a62eaf1..c70e85a 100644
--- a/pythonparser/lexer.py --- a/pythonparser/lexer.py
+++ b/pythonparser/lexer.py +++ b/pythonparser/lexer.py
@@ -79,6 +79,7 @@ class Lexer: @@ -79,6 +79,8 @@ class Lexer:
(3, 4): _reserved_3_1, (3, 4): _reserved_3_1,
(3, 5): _reserved_3_5, (3, 5): _reserved_3_5,
(3, 6): _reserved_3_5, (3, 6): _reserved_3_5,
+ (3, 7): _reserved_3_5, + (3, 7): _reserved_3_5,
+ (3, 8): _reserved_3_5,
} }
""" """
A map from a tuple (*major*, *minor*) corresponding to Python version to A map from a tuple (*major*, *minor*) corresponding to Python version to
@@ -102,6 +103,7 @@ class Lexer: @@ -102,6 +104,8 @@ class Lexer:
(3, 4): _string_prefixes_3_3, (3, 4): _string_prefixes_3_3,
(3, 5): _string_prefixes_3_3, (3, 5): _string_prefixes_3_3,
(3, 6): _string_prefixes_3_6, (3, 6): _string_prefixes_3_6,
+ (3, 7): _string_prefixes_3_6, + (3, 7): _string_prefixes_3_6,
+ (3, 8): _string_prefixes_3_6,
} }
""" """
A map from a tuple (*major*, *minor*) corresponding to Python version to A map from a tuple (*major*, *minor*) corresponding to Python version to
diff --git a/pythonparser/parser.py b/pythonparser/parser.py diff --git a/pythonparser/parser.py b/pythonparser/parser.py
index 10c741d..f748695 100644 index 10c741d..62b93e1 100644
--- a/pythonparser/parser.py --- a/pythonparser/parser.py
+++ b/pythonparser/parser.py +++ b/pythonparser/parser.py
@@ -419,7 +419,7 @@ class Parser(object): @@ -419,7 +419,7 @@ class Parser(object):
@ -27,7 +29,7 @@ index 10c741d..f748695 100644
self.yield_expr = self.yield_expr__26 self.yield_expr = self.yield_expr__26
return return
- elif version in ((3, 0), (3, 1), (3, 2), (3, 3), (3, 4), (3, 5), (3, 6)): - elif version in ((3, 0), (3, 1), (3, 2), (3, 3), (3, 4), (3, 5), (3, 6)):
+ elif version in ((3, 0), (3, 1), (3, 2), (3, 3), (3, 4), (3, 5), (3, 6), (3, 7)): + elif version in ((3, 0), (3, 1), (3, 2), (3, 3), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8)):
if version == (3, 0): if version == (3, 0):
self.with_stmt = self.with_stmt__26 # lol self.with_stmt = self.with_stmt__26 # lol
else: else: