VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Make extract yield error message better

Browse Source
This commit is contained in:
Dave Halter
2020-02-27 01:12:34 +01:00
parent c9334d140b
commit 3708ab3514
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jedi/api/refactoring/extract.py
View File

@@ -297,11 +297,11 @@ def _check_for_non_extractables(nodes):
try: try:
children = n.children children = n.children
except AttributeError: except AttributeError:
if n.value in ('return', 'yield'): if n.value == 'return':
raise RefactoringError( raise RefactoringError(
'Can only extract %s statements if they are at the end.' 'Can only extract return statements if they are at the end.')
% n.value if n.value == 'yield':
) raise RefactoringError('Cannot extract yield statements.')
else: else:
_check_for_non_extractables(children) _check_for_non_extractables(children)

4
test/refactor/extract_function.py
View File

@@ -419,7 +419,7 @@ def x():
return return
pass pass
# ++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++++++++++++++++++++++++++++++++++++++++
Can only extract yield statements if they are at the end. Cannot extract yield statements.
# -------------------------------------------------- random-yield-2 # -------------------------------------------------- random-yield-2
def x(): def x():
#? 0 error {'new_name': 'ab', 'until_line': 4, 'until_column': 10} #? 0 error {'new_name': 'ab', 'until_line': 4, 'until_column': 10}
@@ -429,4 +429,4 @@ def x():
finally: finally:
pass pass
# ++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++++++++++++++++++++++++++++++++++++++++
Can only extract yield statements if they are at the end. Cannot extract yield statements.