Make extract yield error message better

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

View File

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

View File

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