Merge branch 'master' into py314

Author: lieryan

.all-contributorsrc

@@ -573,6 +573,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "Nowa-Ammerlaan",
+      "name": "Nowa Ammerlaan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8460628?v=4",
+      "profile": "https://github.com/Nowa-Ammerlaan",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "projectName": "rope",

.github/workflows/main.yml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
         os: [ubuntu-latest, windows-latest, macos-latest]
       fail-fast: false
     steps:

.readthedocs.yaml

@@ -11,3 +11,6 @@ python:
       path: .
       extra_requirements:
         - doc
+
+sphinx:
+  configuration: docs/conf.py

CONTRIBUTORS.md

@@ -85,6 +85,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <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="https://github.com/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>
       <td align="center" valign="top" width="14.28%"><a href="http://n.zermati.eu"><img src="https://avatars.githubusercontent.com/u/163953?v=4?s=100" width="100px;" alt="Nicolas Zermati"/><br /><sub><b>Nicolas Zermati</b></sub></a><br /><a href="https://github.com/python-rope/rope/commits?author=nicoolas25" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Nowa-Ammerlaan"><img src="https://avatars.githubusercontent.com/u/8460628?v=4?s=100" width="100px;" alt="Nowa Ammerlaan"/><br /><sub><b>Nowa Ammerlaan</b></sub></a><br /><a href="https://github.com/python-rope/rope/commits?author=Nowa-Ammerlaan" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

rope/base/oi/type_hinting/utils.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+import sys
 from typing import TYPE_CHECKING, Optional, Union
 
 import rope.base.utils as base_utils
@@ -81,7 +82,10 @@ def resolve_type(
     """
     Find proper type object from its name.
     """
-    deprecated_aliases = {"collections": "collections.abc"}
+    if sys.version_info < (3, 13):
+        deprecated_aliases = {"collections": "collections.abc"}
+    else:
+        deprecated_aliases = {"collections": "_collections_abc"}
     ret_type = None
     logging.debug("Looking for %s", type_name)
     if "." not in type_name:

rope/contrib/autoimport/sqlite.py

@@ -569,14 +569,17 @@ def filter_folders(folder: Path) -> bool:
         return list(OrderedDict.fromkeys(folder_paths))
 
     def _safe_iterdir(self, folder: Path):
-        dirs = folder.iterdir()
-        while True:
-            try:
-                yield next(dirs)
-            except PermissionError:
-                pass
-            except StopIteration:
-                break
+        try:
+            dirs = folder.iterdir()
+            while True:
+                try:
+                    yield next(dirs)
+                except PermissionError:
+                    pass
+                except StopIteration:
+                    break
+        except PermissionError:
+            pass
 
     def _get_available_packages(self) -> List[Package]:
         packages: List[Package] = [

rope/contrib/autoimport/utils.py

@@ -92,7 +92,7 @@ def sort_and_deduplicate(results: List[Tuple[str, int]]) -> List[str]:
 
 
 def sort_and_deduplicate_tuple(
-    results: List[Tuple[str, str, int]]
+    results: List[Tuple[str, str, int]],
 ) -> List[Tuple[str, str]]:
     """Sort and deduplicate a list of name, module, source entries."""
     results = sorted(results, key=lambda y: y[-1])

rope/refactor/importutils/module_imports.py

@@ -31,7 +31,7 @@ def _get_unbound_names(self, defined_pyobject):
 
     def _get_all_star_list(self, pymodule):
         def _resolve_name(
-            name: Union[pynamesdef.AssignedName, pynames.ImportedName]
+            name: Union[pynamesdef.AssignedName, pynames.ImportedName],
         ) -> List:
             while isinstance(name, pynames.ImportedName):
                 try: