Add isort to pre-commit

.pre-commit-config.yaml

@@ -8,7 +8,13 @@ repos:
   - id: check-added-large-files
 
 - repo: https://github.com/psf/black
-  rev: 22.8.0
+  rev: 22.12.0
   hooks:
   - id: black
     name: black check (Python)
+
+- repo: https://github.com/pycqa/isort
+  rev: 5.11.3
+  hooks:
+  - id: isort
+    name: Sort imports (Python)

bin/tag-release.py

@@ -6,7 +6,6 @@
 
 import toml
 
-
 pyproject = toml.load("pyproject.toml")
 version = pyproject["project"]["version"]
 

pyproject.toml

@@ -76,6 +76,9 @@ target-version = [
 include = 'rope/.*\.pyi?$'
 force-exclude = 'ropetest|rope/base/prefs.py'
 
+[tool.isort]
+profile = "black"
+
 [tool.pytest.ini_options]
 
 python_files = [

rope/__init__.py

@@ -1,14 +1,14 @@
 """rope, a python refactoring library"""
 
-from pkg_resources import get_distribution, DistributionNotFound
+from pkg_resources import DistributionNotFound, get_distribution
 
 try:
     VERSION = get_distribution("rope").version
 except DistributionNotFound:
 
     def get_fallback_version():
-        import re
         import pathlib
+        import re
 
         pyproject = (
             pathlib.Path(__file__).resolve().parent.parent / "pyproject.toml"

rope/base/builtins.py

@@ -3,13 +3,7 @@
 import io
 
 import rope.base.evaluate
-from rope.base import (
-    arguments,
-    ast,
-    pynames,
-    pyobjects,
-    utils,
-)
+from rope.base import arguments, ast, pynames, pyobjects, utils
 
 
 class BuiltinModule(pyobjects.AbstractModule):

rope/base/evaluate.py

@@ -7,14 +7,13 @@
 from rope.base import (
     arguments,
     ast,
-    nameanalyze,
     exceptions,
+    nameanalyze,
     pyobjects,
     pyobjectsdef,
     worder,
 )
 
-
 BadIdentifierError = exceptions.BadIdentifierError
 
 

rope/base/fscommands.py

@@ -6,13 +6,12 @@
 `MercurialCommands` for example.
 
 """
-import re
 import os
+import re
 import shutil
 import subprocess
 import typing
 
-
 FileContent = typing.NewType("FileContent", bytes)
 
 

rope/base/history.py

@@ -1,4 +1,4 @@
-from rope.base import exceptions, change, taskhandle, utils
+from rope.base import change, exceptions, taskhandle, utils
 
 
 class History:

rope/base/oi/memorydb.py

@@ -1,5 +1,5 @@
-from rope.base.oi import objectdb
 from rope.base import utils
+from rope.base.oi import objectdb
 
 
 class MemoryDB(objectdb.FileDict):

rope/base/oi/objectinfo.py

@@ -1,7 +1,7 @@
 import warnings
 
 from rope.base import exceptions, resourceobserver
-from rope.base.oi import objectdb, memorydb, transform
+from rope.base.oi import memorydb, objectdb, transform
 
 
 class ObjectInfoManager:

rope/base/oi/runmod.py

@@ -1,19 +1,19 @@
 def __rope_start_everything():
     import os
-    import sys
     import socket
+    import sys
 
     try:
         import cPickle as pickle
     except ImportError:
         import pickle
-    import marshal
-    import inspect
-    import types
-    import threading
     import base64
     import hashlib
     import hmac
+    import inspect
+    import marshal
+    import threading
+    import types
 
     class _MessageSender:
         def send_data(self, data):

rope/base/oi/soa.py

@@ -1,7 +1,7 @@
 import rope.base.ast
 import rope.base.oi.soi
 import rope.base.pynames
-from rope.base import pyobjects, evaluate, nameanalyze, arguments
+from rope.base import arguments, evaluate, nameanalyze, pyobjects
 
 
 def analyze_module(pycore, pymodule, should_analyze, search_subscopes, followed_calls):

rope/base/oi/soi.py

@@ -5,16 +5,9 @@
 
 """
 import rope.base.builtins  # Use full qualification for clarity.
-from rope.base import (
-    arguments,
-    evaluate,
-    pynames,
-    pyobjects,
-    utils,
-)
+from rope.base import arguments, evaluate, pynames, pyobjects, utils
 from rope.base.oi.type_hinting.factory import get_type_hinting_factory
 
-
 _ignore_inferred = utils.ignore_exception(pyobjects.IsBeingInferredError)
 
 

rope/base/oi/type_hinting/evaluate.py

@@ -1,8 +1,9 @@
 # Based on super lightweight Simple Top-Down Parser from http://effbot.org/zone/simple-top-down-parsing.htm
 # and https://bitbucket.org/emacsway/sqlbuilder/src/default/sqlbuilder/smartsql/contrib/evaluate.py
 import re
-from rope.base.oi.type_hinting import utils
+
 from rope.base import utils as base_utils
+from rope.base.oi.type_hinting import utils
 
 
 class SymbolBase:

rope/base/oi/type_hinting/factory.py

@@ -1,13 +1,14 @@
+from rope.base import utils
 from rope.base.oi.type_hinting import interfaces
 from rope.base.oi.type_hinting.providers import (
     composite,
-    inheritance,
     docstrings,
+    inheritance,
     numpydocstrings,
     pep0484_type_comments,
 )
-from rope.base.oi.type_hinting.resolvers import composite as composite_resolvers, types
-from rope.base import utils
+from rope.base.oi.type_hinting.resolvers import composite as composite_resolvers
+from rope.base.oi.type_hinting.resolvers import types
 
 
 class TypeHintingFactory(interfaces.ITypeHintingFactory):

rope/base/oi/type_hinting/providers/numpydocstrings.py

@@ -4,6 +4,7 @@
 Thanks to @davidhalter for this utils under MIT License.
 """
 import re
+
 from rope.base.ast import literal_eval
 from rope.base.oi.type_hinting.providers import docstrings
 

rope/base/oi/type_hinting/providers/pep0484_type_comments.py

@@ -1,4 +1,5 @@
 import re
+
 from rope.base.oi.type_hinting import utils
 from rope.base.oi.type_hinting.providers import interfaces
 

rope/base/oi/type_hinting/utils.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Union, Optional
+from typing import Optional, Union
 
 import rope.base.utils as base_utils
 from rope.base import evaluate

rope/base/prefs.py

@@ -6,6 +6,7 @@
 from packaging.requirements import Requirement
 from pytoolconfig import PyToolConfig, UniversalKey, field
 from pytoolconfig.sources import Source
+
 from rope.base.resources import Folder
 
 

rope/base/project.py

@@ -4,17 +4,11 @@
 from typing import Optional
 
 import rope.base.fscommands  # Use full qualification for clarity.
-from rope.base import (
-    exceptions,
-    history,
-    pycore,
-    taskhandle,
-    utils,
-)
+import rope.base.resourceobserver as resourceobserver
+from rope.base import exceptions, history, pycore, taskhandle, utils
 from rope.base.exceptions import ModuleNotFoundError
 from rope.base.prefs import Prefs, get_config
 from rope.base.resources import File, Folder, _ResourceMatcher
-import rope.base.resourceobserver as resourceobserver
 
 try:
     import cPickle as pickle

rope/base/pycore.py

@@ -3,19 +3,12 @@
 import warnings
 
 import rope.base.libutils
-import rope.base.resourceobserver
-import rope.base.resources
 import rope.base.oi.doa
 import rope.base.oi.objectinfo
 import rope.base.oi.soa
-from rope.base import (
-    builtins,
-    exceptions,
-    pyobjectsdef,
-    stdmods,
-    taskhandle,
-    utils,
-)
+import rope.base.resourceobserver
+import rope.base.resources
+from rope.base import builtins, exceptions, pyobjectsdef, stdmods, taskhandle, utils
 
 
 class PyCore:

rope/base/pynames.py

@@ -1,12 +1,13 @@
 from __future__ import annotations
+
 import typing
 
 import rope.base.pyobjects
 from rope.base import exceptions, utils
 
-
 if typing.TYPE_CHECKING:
     from typing import Union
+
     from rope.base import pyobjectsdef
 
 

rope/base/pyobjectsdef.py

@@ -5,13 +5,13 @@
 import rope.base.oi.soi
 import rope.base.pyscopes
 from rope.base import (
-    pynamesdef,
-    exceptions,
+    arguments,
     ast,
+    exceptions,
+    fscommands,
     nameanalyze,
+    pynamesdef,
     pyobjects,
-    fscommands,
-    arguments,
     utils,
 )
 

rope/base/pyscopes.py

@@ -1,11 +1,5 @@
 import rope.base.builtins  # Use full qualification for clarity.
-from rope.base import (
-    ast,
-    codeanalyze,
-    exceptions,
-    pynames,
-    utils,
-)
+from rope.base import ast, codeanalyze, exceptions, pynames, utils
 from rope.refactor import patchedast
 
 

rope/base/resources.py

@@ -29,9 +29,9 @@
 import os
 import re
 import warnings
+from pathlib import Path
 
 from rope.base import change, exceptions, fscommands
-from pathlib import Path
 
 
 class Resource:

rope/contrib/autoimport/__init__.py

@@ -2,7 +2,6 @@
 from .pickle import AutoImport as _PickleAutoImport
 from .sqlite import AutoImport as _SqliteAutoImport
 
-
 AutoImport = _PickleAutoImport
 
 __all__ = ["AutoImport"]

rope/contrib/autoimport/parse.py

@@ -10,6 +10,8 @@
 from importlib import import_module
 from typing import Generator, List
 
+from rope.base import ast
+
 from .defs import (
     ModuleCompiled,
     ModuleFile,
@@ -20,8 +22,6 @@
     PartialName,
     Source,
 )
-from rope.base import ast
-
 
 logger = logging.getLogger(__name__)
 

rope/contrib/autoimport/sqlite.py

@@ -6,16 +6,12 @@
 from concurrent.futures import Future, ProcessPoolExecutor, as_completed
 from itertools import chain
 from pathlib import Path
-from typing import Generator, Iterable, List, Optional, Set, Tuple, Iterator
+from typing import Generator, Iterable, Iterator, List, Optional, Set, Tuple
 
-from rope.base import (
-    exceptions,
-    libutils,
-    resourceobserver,
-    taskhandle,
-)
+from rope.base import exceptions, libutils, resourceobserver, taskhandle
 from rope.base.project import Project
 from rope.base.resources import Resource
+from rope.contrib.autoimport import models
 from rope.contrib.autoimport.defs import (
     ModuleFile,
     Name,
@@ -34,7 +30,6 @@
     sort_and_deduplicate_tuple,
 )
 from rope.refactor import importutils
-from rope.contrib.autoimport import models
 
 
 def get_future_names(

rope/contrib/findit.py

@@ -1,10 +1,4 @@
-from rope.base import (
-    exceptions,
-    evaluate,
-    pyobjects,
-    taskhandle,
-    worder,
-)
+from rope.base import evaluate, exceptions, pyobjects, taskhandle, worder
 from rope.contrib import fixsyntax
 from rope.refactor import occurrences