diff options
| author | Claudiu Popa <pcmanticore@gmail.com> | 2018-07-10 08:53:51 +0200 |
|---|---|---|
| committer | Claudiu Popa <pcmanticore@gmail.com> | 2018-07-10 08:54:37 +0200 |
| commit | 08513297117e725c549d72ab8b80138e50698040 (patch) | |
| tree | f1a551a83d56a1385dfb23e1d81fe96512f8c338 | |
| parent | 7e999d609c53e82be51bb91ae0d2163c63b904a0 (diff) | |
| download | pylint-git-08513297117e725c549d72ab8b80138e50698040.tar.gz | |
`trailing-comma-tuple` can be emitted for `return` statements as well.
Close #2269
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | pylint/checkers/refactoring.py | 2 | ||||
| -rw-r--r-- | pylint/test/functional/trailing_comma_tuple.py | 8 | ||||
| -rw-r--r-- | pylint/test/functional/trailing_comma_tuple.txt | 2 |
4 files changed, 15 insertions, 1 deletions
@@ -7,6 +7,10 @@ What's New in Pylint 2.0? Release date: |TBA| + * `trailing-comma-tuple` can be emitted for `return` statements as well. + + Close #2269 + * Fix a false positive ``inconsistent-return-statements`` message when exception is raised inside an else statement. diff --git a/pylint/checkers/refactoring.py b/pylint/checkers/refactoring.py index df554f791..e4883bccd 100644 --- a/pylint/checkers/refactoring.py +++ b/pylint/checkers/refactoring.py @@ -1230,7 +1230,7 @@ def is_trailing_comma(tokens, index): return 0 curline_start = get_curline_index_start() for prevtoken in tokens[curline_start:index]: - if '=' in prevtoken.string: + if '=' in prevtoken.string or prevtoken.string == 'return': return True return False diff --git a/pylint/test/functional/trailing_comma_tuple.py b/pylint/test/functional/trailing_comma_tuple.py index ec8cfc8c7..38ccdad05 100644 --- a/pylint/test/functional/trailing_comma_tuple.py +++ b/pylint/test/functional/trailing_comma_tuple.py @@ -24,3 +24,11 @@ test(widget=1, label='test') test(widget=1, \ label='test') + + +def some_func(first, second): + if first: + return first, # [trailing-comma-tuple] + if second: + return (first, second,) + return first, second, # [trailing-comma-tuple] diff --git a/pylint/test/functional/trailing_comma_tuple.txt b/pylint/test/functional/trailing_comma_tuple.txt index df97ee08c..a2687cd37 100644 --- a/pylint/test/functional/trailing_comma_tuple.txt +++ b/pylint/test/functional/trailing_comma_tuple.txt @@ -2,3 +2,5 @@ trailing-comma-tuple:3::Disallow trailing comma tuple trailing-comma-tuple:4::Disallow trailing comma tuple trailing-comma-tuple:5::Disallow trailing comma tuple trailing-comma-tuple:6::Disallow trailing comma tuple +trailing-comma-tuple:31::Disallow trailing comma tuple +trailing-comma-tuple:34::Disallow trailing comma tuple |