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

Fix #509. Fix read/write analysis of the left-hand side of an augmented assignment #524

Merged
merged 1 commit into from Nov 21, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
@@ -1,6 +1,7 @@
# **Upcoming release**

- #492, Feat: Global configuration support
- #492 Feat: Global configuration support
- #509 Fix read/write analysis of the left-hand side of an augmented assignment

# Release 1.4.0

Expand Down
10 changes: 5 additions & 5 deletions rope/refactor/extract.py
Expand Up @@ -856,12 +856,12 @@ def _Assign(self, node):

def _AugAssign(self, node):
ast.walk(node.value, self)
if isinstance(node.target, ast.Subscript):
target_id = node.target.value.id
else:
if isinstance(node.target, ast.Name):
target_id = node.target.id
self._read_variable(target_id, node.target.lineno)
self._written_variable(target_id, node.target.lineno)
self._read_variable(target_id, node.target.lineno)
self._written_variable(target_id, node.target.lineno)
else:
ast.walk(node.target, self)

def _ClassDef(self, node):
self._written_variable(node.name, node.lineno)
Expand Down
64 changes: 63 additions & 1 deletion ropetest/refactor/extracttest.py
Expand Up @@ -1762,7 +1762,69 @@ def g():
""")
self.assertEqual(expected, refactored)

def test_extract_method_and_augmentedj_assignment_in_try_block(self):
def test_extract_method_and_augmented_assignment_nested_1(self):
code = dedent("""\
def f():
my_var = [[0], [1], [2]]
my_var[0][0] += 1
print(1)
""")
start, end = self._convert_line_range_to_offset(code, 4, 4)
refactored = self.do_extract_method(code, start, end, "g")
expected = dedent("""\
def f():
my_var = [[0], [1], [2]]
my_var[0][0] += 1
g()

def g():
print(1)
""")
self.assertEqual(expected, refactored)

def test_extract_method_and_augmented_assignment_nested_2(self):
code = dedent("""\
def f():
my_var = [[0], [1], [2]]
my_var[0][0] += 1
print(my_var)
""")
start, end = self._convert_line_range_to_offset(code, 3, 3)
refactored = self.do_extract_method(code, start, end, "g")
expected = dedent("""\
def f():
my_var = [[0], [1], [2]]
g(my_var)
print(my_var)

def g(my_var):
my_var[0][0] += 1
""")
self.assertEqual(expected, refactored)

def test_extract_method_and_augmented_assignment_var_to_read_in_lhs(self):
code = dedent("""\
def f():
var_to_read = 0
my_var = [0, 1, 2]
my_var[var_to_read] += 1
print(my_var)
""")
start, end = self._convert_line_range_to_offset(code, 4, 4)
refactored = self.do_extract_method(code, start, end, "g")
expected = dedent("""\
def f():
var_to_read = 0
my_var = [0, 1, 2]
g(my_var, var_to_read)
print(my_var)

def g(my_var, var_to_read):
my_var[var_to_read] += 1
""")
self.assertEqual(expected, refactored)

def test_extract_method_and_augmented_assignment_in_try_block(self):
code = dedent("""\
def f():
any_subscriptable = [0]
Expand Down