Merge branch 'master' into minor-refactorings

Author: lieryan

.all-contributorsrc

@@ -555,6 +555,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "sandratsy",
+      "name": "Sandra Tan Shi Yun",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26302933?v=4",
+      "profile": "https://github.com/sandratsy",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "projectName": "rope",

.gitignore

@@ -10,7 +10,7 @@ __pycache__/
 .Python
 build/
 develop-eggs/
-dist/
+/dist/
 downloads/
 eggs/
 .eggs/

CHANGELOG.md

@@ -1,6 +1,9 @@
 # **Upcoming release**
 
+- Check for ast.Attributes when finding occurrences in fstrings (@sandratsy)
+- #777, #698 add validation to refuse Rename refactoring to a python keyword
 - #730 Match on module aliases for autoimport suggestions
+- #755 Remove dependency on `build` package being installed while running tests
 
 # Release 1.12.0
 

CONTRIBUTORS.md

@@ -83,6 +83,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://bamboolib.8080labs.com"><img src="https://avatars.githubusercontent.com/u/13402027?v=4?s=100" width="100px;" alt="Tobias Krabel"/><br /><sub><b>Tobias Krabel</b></sub></a><br /><a href="https://github.com/python-rope/rope/commits?author=tkrabel" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="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/MrBago"><img src="https://avatars.githubusercontent.com/u/223219?v=4?s=100" width="100px;" alt="Bago Amirbekian"/><br /><sub><b>Bago Amirbekian</b></sub></a><br /><a href="https://github.com/python-rope/rope/commits?author=MrBago" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://mender.ai"><img src="https://avatars.githubusercontent.com/u/3324?v=4?s=100" width="100px;" alt="Ray Myers"/><br /><sub><b>Ray Myers</b></sub></a><br /><a href="https://github.com/python-rope/rope/commits?author=raymyers" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="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/sandratsy"><img src="https://avatars.githubusercontent.com/u/26302933?v=4?s=100" width="100px;" alt="Sandra Tan Shi Yun"/><br /><sub><b>Sandra Tan Shi Yun</b></sub></a><br /><a href="https://github.com/python-rope/rope/commits?author=sandratsy" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

MANIFEST.in

@@ -1,4 +1,4 @@
-include README.rst COPYING setup.py MANIFEST.in CHANGELOG.md
+include README.rst COPYING setup.py MANIFEST.in CHANGELOG.md ropetest-package-fixtures/external_fixturepkg/dist/external_fixturepkg-1.0.0-py3-none-any.whl ropetest-package-fixtures/external_fixturepkg/dist/external_fixturepkg-1.0.0.tar.gz
 recursive-include rope *.py
 recursive-include docs *.rst
 recursive-include ropetest *.py

pyproject.toml

@@ -87,6 +87,7 @@ profile = "black"
 
 [tool.pytest.ini_options]
 
+testpaths = "ropetest"
 python_files = [
     "*test.py",
     "__init__.py",

rope/contrib/autoimport/utils.py

@@ -54,7 +54,7 @@ def get_package_source(
     if "site-packages" in package.parts:
         return Source.SITE_PACKAGE
     if sys.version_info < (3, 10, 0):
-        if str(package).startswith(sys.prefix):
+        if str(package).startswith(sys.base_prefix):
             return Source.STANDARD
     else:
         if name in sys.stdlib_module_names:

rope/refactor/occurrences.py

@@ -37,6 +37,7 @@
 
 import contextlib
 import re
+from typing import Iterator
 
 from rope.base import (
     ast,
@@ -319,7 +320,7 @@ def __init__(self, name, docs=False):
         )
         self.pattern = self._get_occurrence_pattern(self.name)
 
-    def find_offsets(self, source):
+    def find_offsets(self, source: str) -> Iterator[int]:
         if not self._fast_file_query(source):
             return
         if self.docs:
@@ -328,22 +329,25 @@ def find_offsets(self, source):
             searcher = self._re_search
         yield from searcher(source)
 
-    def _re_search(self, source):
+    def _re_search(self, source: str) -> Iterator[int]:
         for match in self.pattern.finditer(source):
             if match.groupdict()["occurrence"]:
                 yield match.start("occurrence")
             elif match.groupdict()["fstring"]:
                 f_string = match.groupdict()["fstring"]
-                for occurrence_node in self._search_in_f_string(f_string):
-                    yield match.start("fstring") + occurrence_node.col_offset
+                for offset in self._search_in_f_string(f_string):
+                    yield match.start("fstring") + offset
 
-    def _search_in_f_string(self, f_string):
+    def _search_in_f_string(self, f_string: str) -> Iterator[int]:
         tree = ast.parse(f_string)
         for node in ast.walk(tree):
             if isinstance(node, ast.Name) and node.id == self.name:
-                yield node
+                yield node.col_offset
+            elif isinstance(node, ast.Attribute) and node.attr == self.name:
+                assert node.end_col_offset is not None
+                yield node.end_col_offset - len(self.name)
 
-    def _normal_search(self, source):
+    def _normal_search(self, source: str) -> Iterator[int]:
         current = 0
         while True:
             try:

rope/refactor/rename.py

@@ -1,4 +1,5 @@
 import warnings
+from keyword import iskeyword
 
 from rope.base import (
     codeanalyze,
@@ -105,6 +106,7 @@ def unsure_func(value=unsure):
             resources = [self.resource]
         if resources is None:
             resources = self.project.get_python_files()
+        self.validate_changes(new_name)
         changes = ChangeSet(f"Renaming <{self.old_name}> to <{new_name}>")
         finder = occurrences.create_finder(
             self.project,
@@ -128,6 +130,16 @@ def unsure_func(value=unsure):
                 self._rename_module(resource, new_name, changes)
         return changes
 
+    def validate_changes(
+        self,
+        new_name: str,
+        **_unused,
+    ):
+        if iskeyword(new_name):
+            raise exceptions.RefactoringError(
+                f"Invalid refactoring target name. '{new_name}' is a Python keyword."
+            )
+
     def _is_allowed_to_move(self, resources, resource):
         if resource.is_folder():
             try:

ropetest-package-fixtures/external_fixturepkg/README.md

@@ -0,0 +1,12 @@
+# example_project
+
+Just an example project for testing rope.
+
+
+To build this package, run:
+
+```bash
+$ python -m build
+```
+
+This generates packages in `dist` folder.