Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

F601 - dictionary key repeated with different values #1441

Merged
merged 1 commit into from
Oct 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scapy/contrib/homeplugav.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
0xA024: "'Read Module Data Request'",
0xA025: "'Read Module Data Confirmation'",
0xA028: "'Write Module Data to NVM Request'",
0xA028: "'Write Module Data to NVM Confirmation'",
0xA029: "'Write Module Data to NVM Confirmation'",
0xA034: "'Sniffer Request'",
0xA035: "'Sniffer Confirmation'",
0xA036: "'Sniffer Indicates'",
Expand All @@ -62,7 +62,7 @@
0xA050: "'Set Encryption Key Request'",
0xA051: "'Set Encryption Key Request Confirmation'",
0xA058: "'Read Configuration Block Request'",
0xA058: "'Read Configuration Block Confirmation'",
0xA059: "'Read Configuration Block Confirmation'",
0xA062: "'Embedded Host Action Required Indication'"}

HPAVversionList = {0x00: "1.0",
Expand Down
2 changes: 1 addition & 1 deletion scapy/layers/bluetooth.py
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ class EIR_Hdr(Packet):
0x20: "svc_data_32_bit_uuid",
0x21: "svc_data_128_bit_uuid",
0x22: "sec_conn_confirm",
0x22: "sec_conn_rand",
0x23: "sec_conn_rand",
0x24: "uri",
0xff: "mfg_specific_data",
}),
Expand Down
1 change: 0 additions & 1 deletion scapy/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,6 @@ def do_graph(graph, prog=None, format=None, target=None, type=None, string=None,
"^": "\\^{}",
"$": "\\$",
"#": "\\#",
"~": "\\~",
"_": "\\_",
"&": "\\&",
"%": "\\%",
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ commands = flake8 scapy/
# flake8 configuration
[flake8]
select = E1,E2,E30,E4,E5,E70,E71,E72,E74,
F402,F405,F8,
F402,F405,F6,F8,
W2,W3
ignore = E731
exclude = scapy/modules/six.py,
Expand Down