diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2016-08-03 23:28:28 +0200 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-08-04 08:20:24 +0000 |
| commit | d04be0149d1942e691030d20e52e94ed2eabfab6 (patch) | |
| tree | 2fb0b158c5e932fc3f360fc0677c723e6c494a06 /tools/asn2wrs.py | |
| parent | 92eecfd25533147c793e483bd54a32afc14d2b8a (diff) | |
Ply parser updated to 3.8 from http://www.dabeaz.com/ply/
The Ubuntu packaged Ply 3.7 with Ubuntu 16.04's Python makes
ASN.1 based dissector generation fail.
Ply's API changed after 3.5 and the small change to asn2wrs.py
adapts to that.
The commit breaking the API in Ply's repository is the following:
commit af651673ba6117a0a5405055a92170fffd028106
Author: David Beazley <dave@dabeaz.com>
Date: Tue Apr 21 16:31:32 2015 -0500
Added optional support for defaulted states
Change-Id: I1db33fdcccf7c39ecdb0e435a5ea9183362471ad
Bug: 12621
Reviewed-on: https://code.wireshark.org/review/16864
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Tested-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'tools/asn2wrs.py')
| -rwxr-xr-x | tools/asn2wrs.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py index c818882f88..bf18bda9d0 100755 --- a/tools/asn2wrs.py +++ b/tools/asn2wrs.py @@ -7949,7 +7949,8 @@ def eth_main(): if ectx.dbg('y'): yd = 1 if ectx.dbg('p'): pd = 2 lexer = lex.lex(debug=ld) - yacc.yacc(method='LALR', debug=yd) + parser = yacc.yacc(method='LALR', debug=yd) + parser.defaulted_states = {} g_conform = ectx.conform ast = [] for fn in args: |