Skip to content

Commit 935eb8d

Browse files
author
MarcoFalke
committed
Merge #12295: Enable flake8 warnings for all currently non-violated rules
a9d0ebc Enable flake8 warnings for all currently non-violated rules (practicalswift) 4cbab15 tests: Fix accidental redefinition of previously defined variable via list comprehension (practicalswift) 0b9207e Enable flake8 warning for "list comprehension redefines 'foo' from line N" (F812) (practicalswift) Pull request description: * Enable `flake8` warnings for all currently non-violated rules * Fix accidental redefinition via list comprehension Tree-SHA512: 738b87789e99d02abb2c6b8ff58f65c0cbfeb93e3bf320763e033e510ebd0a4f72861bc8faaf42c14a056a5d4659c33dc70a63730a32cc15159559427bf21193
2 parents 3843780 + a9d0ebc commit 935eb8d

File tree

2 files changed

+58
-5
lines changed

2 files changed

+58
-5
lines changed

contrib/devtools/lint-python.sh

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,58 @@
66
#
77
# Check for specified flake8 warnings in python files.
88

9-
# F401: module imported but unused
10-
flake8 --ignore=B,C,E,F,I,N,W --select=F401 .
9+
# E112 expected an indented block
10+
# E113 unexpected indentation
11+
# E115 expected an indented block (comment)
12+
# E116 unexpected indentation (comment)
13+
# E125 continuation line with same indent as next logical line
14+
# E131 continuation line unaligned for hanging indent
15+
# E133 closing bracket is missing indentation
16+
# E223 tab before operator
17+
# E224 tab after operator
18+
# E271 multiple spaces after keyword
19+
# E272 multiple spaces before keyword
20+
# E273 tab after keyword
21+
# E274 tab before keyword
22+
# E275 missing whitespace after keyword
23+
# E304 blank lines found after function decorator
24+
# E306 expected 1 blank line before a nested definition
25+
# E502 the backslash is redundant between brackets
26+
# E702 multiple statements on one line (semicolon)
27+
# E703 statement ends with a semicolon
28+
# E714 test for object identity should be "is not"
29+
# E721 do not compare types, use "isinstance()"
30+
# E741 do not use variables named "l", "O", or "I"
31+
# E742 do not define classes named "l", "O", or "I"
32+
# E743 do not define functions named "l", "O", or "I"
33+
# F401 module imported but unused
34+
# F402 import module from line N shadowed by loop variable
35+
# F404 future import(s) name after other statements
36+
# F406 "from module import *" only allowed at module level
37+
# F407 an undefined __future__ feature name was imported
38+
# F601 dictionary key name repeated with different values
39+
# F602 dictionary key variable name repeated with different values
40+
# F621 too many expressions in an assignment with star-unpacking
41+
# F622 two or more starred expressions in an assignment (a, *b, *c = d)
42+
# F631 assertion test is a tuple, which are always True
43+
# F701 a break statement outside of a while or for loop
44+
# F702 a continue statement outside of a while or for loop
45+
# F703 a continue statement in a finally block in a loop
46+
# F704 a yield or yield from statement outside of a function
47+
# F705 a return statement with arguments inside a generator
48+
# F706 a return statement outside of a function/method
49+
# F707 an except: block as not the last exception handler
50+
# F811 redefinition of unused name from line N
51+
# F812 list comprehension redefines 'foo' from line N
52+
# F822 undefined name name in __all__
53+
# F823 local variable name … referenced before assignment
54+
# F831 duplicate argument name in function definition
55+
# W292 no newline at end of file
56+
# W504 line break after binary operator
57+
# W601 .has_key() is deprecated, use "in"
58+
# W602 deprecated form of raising exception
59+
# W603 "<>" is deprecated, use "!="
60+
# W604 backticks are deprecated, use "repr()"
61+
# W605 invalid escape sequence "x"
62+
63+
flake8 --ignore=B,C,E,F,I,N,W --select=E112,E113,E115,E116,E125,E131,E133,E223,E224,E271,E272,E273,E274,E275,E304,E306,E502,E702,E703,E714,E721,E741,E742,E743,F401,F402,F404,F406,F407,F601,F602,F621,F622,F631,F701,F702,F703,F704,F705,F706,F707,F811,F812,F822,F823,F831,W292,W504,W601,W602,W603,W604,W605 .

test/functional/rpc_fundrawtransaction.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ def run_test(self):
223223
assert_raises_rpc_error(-1, "JSON value is not a string as expected", self.nodes[2].fundrawtransaction, rawtx, {'change_type': None})
224224
assert_raises_rpc_error(-5, "Unknown change type", self.nodes[2].fundrawtransaction, rawtx, {'change_type': ''})
225225
rawtx = self.nodes[2].fundrawtransaction(rawtx, {'change_type': 'bech32'})
226-
tx = self.nodes[2].decoderawtransaction(rawtx['hex'])
227-
assert_equal('witness_v0_keyhash', tx['vout'][rawtx['changepos']]['scriptPubKey']['type'])
226+
dec_tx = self.nodes[2].decoderawtransaction(rawtx['hex'])
227+
assert_equal('witness_v0_keyhash', dec_tx['vout'][rawtx['changepos']]['scriptPubKey']['type'])
228228

229229
#########################################################################
230230
# test a fundrawtransaction with a VIN smaller than the required amount #
@@ -676,7 +676,7 @@ def run_test(self):
676676
self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 2*min_relay_tx_fee}),
677677
self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 2*min_relay_tx_fee, "subtractFeeFromOutputs": [0]})]
678678

679-
dec_tx = [self.nodes[3].decoderawtransaction(tx['hex']) for tx in result]
679+
dec_tx = [self.nodes[3].decoderawtransaction(tx_['hex']) for tx_ in result]
680680
output = [d['vout'][1 - r['changepos']]['value'] for d, r in zip(dec_tx, result)]
681681
change = [d['vout'][r['changepos']]['value'] for d, r in zip(dec_tx, result)]
682682

0 commit comments

Comments
 (0)