Merge pull request #583 from edreamleo/ekr-clean-imports

PR: Clean imports and fix pylint complaints

.pylintrc

@@ -60,6 +60,7 @@ disable=
         modified-iterating-list,
         used-before-assignment,
         unsubscriptable-object,
+        use-sequence-for-iteration,
         unpacking-non-sequence,
 
     # Rope: to be removed.

rope/base/evaluate.py

@@ -5,12 +5,12 @@
 import rope.base.pynames
 import rope.base.pyobjects
 from rope.base import (
+    arguments,
     ast,
     astutils,
     exceptions,
     pyobjects,
     pyobjectsdef,
-    arguments,
     worder,
 )
 

rope/base/libutils.py

@@ -3,9 +3,7 @@
 
 import rope.base.project
 import rope.base.pycore
-from rope.base import pyobjectsdef
-from rope.base import utils
-from rope.base import taskhandle
+from rope.base import pyobjectsdef, taskhandle, utils
 
 
 def path_to_resource(project, path, type=None):

rope/base/oi/soi.py

@@ -7,7 +7,7 @@
 import rope.base.builtins
 import rope.base.pynames
 import rope.base.pyobjects
-from rope.base import evaluate, utils, arguments
+from rope.base import arguments, evaluate, utils
 from rope.base.oi.type_hinting.factory import get_type_hinting_factory
 
 

rope/base/pycore.py

@@ -8,13 +8,14 @@
 import rope.base.oi.doa
 import rope.base.oi.objectinfo
 import rope.base.oi.soa
-from rope.base import builtins
-from rope.base import exceptions
-from rope.base import pyobjectsdef
-from rope.base import stdmods
-from rope.base import taskhandle
-from rope.base import utils
-from rope.base.exceptions import ModuleNotFoundError
+from rope.base import (
+    builtins,
+    exceptions,
+    pyobjectsdef,
+    stdmods,
+    taskhandle,
+    utils,
+)
 
 
 class PyCore:

rope/base/pynames.py

@@ -1,3 +1,4 @@
+# These imports are tricky. It's easy to cause circular imports.
 from __future__ import annotations
 
 import typing
@@ -7,6 +8,7 @@
 
 
 if typing.TYPE_CHECKING:
+    # pyobjectsdef appears only in annotations.
     from typing import Union
     from rope.base import pyobjectsdef
 

rope/base/resources.py

@@ -30,9 +30,7 @@
 import re
 import warnings
 
-from rope.base import change
-from rope.base import exceptions
-from rope.base import fscommands
+from rope.base import change, exceptions, fscommands
 from pathlib import Path
 
 

rope/base/taskhandle.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Optional, Sequence
 
-from rope.base import utils, exceptions
+from rope.base import exceptions, utils
 
 
 class BaseJobSet(ABC):

rope/contrib/autoimport/pickle.py

@@ -12,14 +12,16 @@
 
 import re
 
-from rope.base import builtins
-from rope.base import exceptions
-from rope.base import libutils
-from rope.base import pynames
-from rope.base import pyobjects
-from rope.base import resources
-from rope.base import resourceobserver
-from rope.base import taskhandle
+from rope.base import (
+    builtins,
+    exceptions,
+    libutils,
+    pynames,
+    pyobjects,
+    resourceobserver,
+    resources,
+    taskhandle,
+)
 from rope.refactor import importutils
 
 

rope/contrib/autoimport/sqlite.py

@@ -8,7 +8,12 @@
 from pathlib import Path
 from typing import Generator, Iterable, List, Optional, Set, Tuple, Iterator
 
-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.defs import (

rope/contrib/codeassist.py

@@ -4,15 +4,17 @@
 
 import rope.base.codeanalyze
 import rope.base.evaluate
-from rope.base import builtins
-from rope.base import exceptions
-from rope.base import libutils
-from rope.base import pynames
-from rope.base import pynamesdef
-from rope.base import pyobjects
-from rope.base import pyobjectsdef
-from rope.base import pyscopes
-from rope.base import worder
+from rope.base import (
+    builtins,
+    exceptions,
+    libutils,
+    pynames,
+    pynamesdef,
+    pyobjects,
+    pyobjectsdef,
+    pyscopes,
+    worder,
+)
 from rope.contrib import fixsyntax
 from rope.refactor import functionutils
 

rope/contrib/findit.py

@@ -1,7 +1,7 @@
 import rope.base.codeanalyze
 import rope.base.evaluate
 import rope.base.pyobjects
-from rope.base import taskhandle, exceptions, worder
+from rope.base import exceptions, taskhandle, worder
 from rope.contrib import fixsyntax
 from rope.refactor import occurrences
 

rope/contrib/fixsyntax.py

@@ -1,9 +1,11 @@
 import rope.base.codeanalyze
 import rope.base.evaluate
-from rope.base import exceptions
-from rope.base import libutils
-from rope.base import utils
-from rope.base import worder
+from rope.base import (
+    exceptions,
+    libutils,
+    utils,
+    worder,
+)
 from rope.base.codeanalyze import ArrayLinesAdapter, LogicalLineFinder
 
 

rope/contrib/generate.py

@@ -1,6 +1,13 @@
 import rope.base.evaluate
-from rope.base import libutils
-from rope.base import change, pyobjects, exceptions, pynames, worder, codeanalyze
+from rope.base import (
+    change,
+    codeanalyze,
+    exceptions,
+    libutils,
+    pynames,
+    pyobjects,
+    worder,
+)
 from rope.refactor import sourceutils, importutils, functionutils, suites
 
 

rope/refactor/change_signature.py

@@ -1,12 +1,14 @@
 import copy
 
 import rope.base.exceptions
-from rope.base import codeanalyze
-from rope.base import evaluate
-from rope.base import pyobjects
-from rope.base import taskhandle
-from rope.base import utils
-from rope.base import worder
+from rope.base import (
+    codeanalyze,
+    evaluate,
+    pyobjects,
+    taskhandle,
+    utils,
+    worder,
+)
 from rope.base.change import ChangeContents, ChangeSet
 from rope.refactor import occurrences, functionutils
 

rope/refactor/encapsulate_field.py

@@ -1,10 +1,12 @@
-from rope.base import evaluate
-from rope.base import exceptions
-from rope.base import libutils
-from rope.base import pynames
-from rope.base import taskhandle
-from rope.base import utils
-from rope.base import worder
+from rope.base import (
+    evaluate,
+    exceptions,
+    libutils,
+    pynames,
+    taskhandle,
+    utils,
+    worder,
+)
 from rope.base.change import ChangeSet, ChangeContents
 from rope.refactor import sourceutils, occurrences
 

rope/refactor/inline.py

@@ -22,15 +22,14 @@
 import rope.base.exceptions
 import rope.refactor.functionutils
 from rope.base import (
-    ast,
+    codeanalyze,
+    evaluate,
+    libutils,
     pynames,
     pyobjects,
-    codeanalyze,
     taskhandle,
-    evaluate,
-    worder,
     utils,
-    libutils,
+    worder,
 )
 from rope.base.change import ChangeSet, ChangeContents
 from rope.refactor import (

rope/refactor/introduce_factory.py

@@ -1,7 +1,6 @@
 import rope.base.exceptions
 import rope.base.pyobjects
-from rope.base import libutils
-from rope.base import taskhandle, evaluate
+from rope.base import evaluate, libutils, taskhandle
 from rope.base.change import ChangeSet, ChangeContents
 from rope.refactor import rename, occurrences, sourceutils, importutils
 

rope/refactor/introduce_parameter.py

@@ -1,5 +1,10 @@
 import rope.base.change
-from rope.base import exceptions, evaluate, worder, codeanalyze
+from rope.base import (
+    codeanalyze,
+    exceptions,
+    evaluate,
+    worder,
+)
 from rope.refactor import functionutils, sourceutils, occurrences
 
 

rope/refactor/localtofield.py

@@ -1,4 +1,9 @@
-from rope.base import pynames, evaluate, exceptions, worder
+from rope.base import (
+    evaluate,
+    exceptions,
+    pynames,
+    worder,
+)
 from rope.refactor.rename import Rename
 
 

rope/refactor/method_object.py

@@ -1,7 +1,13 @@
 import warnings
 
-from rope.base import libutils
-from rope.base import pyobjects, exceptions, change, evaluate, codeanalyze
+from rope.base import (
+    change,
+    codeanalyze,
+    evaluate,
+    exceptions,
+    libutils,
+    pyobjects,
+)
 from rope.refactor import sourceutils, occurrences, rename
 
 

rope/refactor/move.py

@@ -5,14 +5,14 @@
 
 """
 from rope.base import (
-    pyobjects,
     codeanalyze,
+    evaluate,
     exceptions,
+    libutils,
     pynames,
+    pyobjects,
     taskhandle,
-    evaluate,
     worder,
-    libutils,
 )
 from rope.base.change import ChangeSet, ChangeContents, MoveResource
 from rope.refactor import importutils, rename, occurrences, sourceutils, functionutils

rope/refactor/multiproject.py

@@ -5,7 +5,7 @@
 
 """
 
-from rope.base import resources, libutils
+from rope.base import libutils, resources
 
 
 class MultiProjectRefactoring:

ropetest/contrib/codeassisttest.py

@@ -1341,7 +1341,7 @@ def _underlined_func():
 
     def tearDown(self):
         testutils.remove_project(self.project)
-        super(self.__class__, self).tearDown()
+        super().tearDown()
 
     def _assist(self, code, resource=None, **kwds):
         return code_assist(self.project, code, len(code), resource, **kwds)

ropetest/projecttest.py

@@ -1,8 +1,7 @@
 import os.path
 import shutil
 from textwrap import dedent
-
-import pytest
+import unittest
 
 from rope.base.exceptions import RopeError, ResourceNotFoundError
 from rope.base.fscommands import FileSystemCommands
@@ -12,9 +11,6 @@
 from ropetest import testutils
 
 
-import unittest
-
-
 class ProjectTest(unittest.TestCase):
     def setUp(self):
         unittest.TestCase.setUp(self)
@@ -1011,7 +1007,7 @@ def test_none_project_rope_folder(self):
     def test_getting_project_rope_folder(self):
         self.project = testutils.sample_project(ropefolder=".ropeproject")
         self.assertTrue(self.project.ropefolder.exists())
-        self.assertTrue(".ropeproject", self.project.ropefolder.path)
+        self.assertEqual(".ropeproject", self.project.ropefolder.path)
 
     def test_setting_ignored_resources(self):
         self.project = testutils.sample_project(ignored_resources=["myfile.txt"])
@@ -1063,7 +1059,7 @@ def test_normal_fscommands(self):
         self.project = testutils.sample_project(fscommands=fscommands)
         myfile = self.project.get_file("myfile.txt")
         myfile.create()
-        self.assertTrue("create_file ", fscommands.log)
+        self.assertEqual("create_file ", fscommands.log)
 
     def test_fscommands_and_ignored_resources(self):
         fscommands = _MockFSCommands()
@@ -1079,7 +1075,7 @@ def test_deprecated_fscommands(self):
         self.project = testutils.sample_project(fscommands=fscommands)
         myfile = self.project.get_file("myfile.txt")
         myfile.create()
-        self.assertTrue("create_file ", fscommands.log)
+        self.assertEqual("create_file ", fscommands.log)
 
     def test_ignored_resources_and_prefixes(self):
         self.project = testutils.sample_project(ignored_resources=[".hg"])