PY-18216 Move and other refactorings don't run full-blown optimize imports

but rather only delete unused imports so as not to cause unwanted
changes in affected files.

python/testData/refactoring/move/cleanupImportsAfterMove/after/src/main.py

@@ -1,5 +1,5 @@
-from lib import C
 from lib import D
+from lib import C
 
 
 class C3:

python/testData/refactoring/move/cleanupImportsAfterMove/after/src/use1.py

@@ -1,5 +1,5 @@
-from lib import A, C
 from lib import B
+from lib import A, C
 from other import C1, C2
 
 print(C1, C2, A, B, C)

python/testData/refactoring/move/cleanupImportsAfterMove/after/src/use2.py

@@ -1,6 +1,6 @@
-from lib import A, C
-from lib import B
 from main import *
+from lib import B
+from lib import A, C
 from other import C1, C2
 
 print(C1, C2, C3, A, B, C)

python/testData/refactoring/move/module/after/src/a.py

@@ -1,6 +1,6 @@
-import p1
 from p1 import m1
 from p1.m1 import foo
+import p1
 
 p1.m1.foo
 m1.bar

python/testData/refactoring/move/moduleToNonPackage/after/src/a.py

@@ -1,6 +1,6 @@
-import nonp3.m1
 from nonp3 import m1
 from nonp3.m1 import foo
+import nonp3.m1
 
 nonp3.m1.foo
 m1.bar

python/testData/refactoring/move/moveFileDoesntReorderImports/after/src/mod.py

@@ -0,0 +1,5 @@
+import c
+from pkg import b
+import a
+
+print(a, b, c)

python/testData/refactoring/move/moveFileDoesntReorderImports/before/src/mod.py

@@ -0,0 +1,5 @@
+import c
+import b
+import a
+
+print(a, b, c)

python/testData/refactoring/move/moveSymbolDoesntReorderImportsInOriginFile/after/src/main.py

@@ -0,0 +1,4 @@
+import c
+import a
+
+print(a, c)

python/testData/refactoring/move/moveSymbolDoesntReorderImportsInOriginFile/after/src/other.py

@@ -0,0 +1,5 @@
+import b
+
+
+def func():
+    print(b)

python/testData/refactoring/move/moveSymbolDoesntReorderImportsInOriginFile/before/src/main.py

@@ -0,0 +1,10 @@
+import c
+import a
+import b
+
+
+def func():
+    print(b)
+
+
+print(a, c)

python/testData/refactoring/move/moveSymbolDoesntReorderImportsInUsageFile/after/src/main.py

@@ -0,0 +1 @@
+

python/testData/refactoring/move/moveSymbolDoesntReorderImportsInUsageFile/after/src/other.py

@@ -0,0 +1,2 @@
+def func():
+    pass

python/testData/refactoring/move/moveSymbolDoesntReorderImportsInUsageFile/after/src/usage.py

@@ -0,0 +1,5 @@
+import b
+import a
+from other import func
+
+print(func, a, b)

python/testData/refactoring/move/moveSymbolDoesntReorderImportsInUsageFile/before/src/main.py

@@ -0,0 +1,2 @@
+def func():
+    pass

python/testData/refactoring/move/moveSymbolDoesntReorderImportsInUsageFile/before/src/usage.py

@@ -0,0 +1,5 @@
+from main import *
+import b
+import a
+
+print(func, a, b)

python/testData/refactoring/move/optimizeImportsAfterMoveInvalidatesMembersToBeMoved/after/src/src.py

@@ -16,9 +16,11 @@
 # You should have received a copy of the GNU General Public License
 # along with Serviceform.  If not, see <http://www.gnu.org/licenses/>.
 import datetime
-
-import logging
 import string
+import logging
+from enum import Enum
+from typing import Tuple, Set, Optional, Sequence, Iterator, Iterable, TYPE_CHECKING
+
 from colorful.fields import RGBColorField
 from django.conf import settings
 from django.contrib.contenttypes.fields import GenericRelation
@@ -30,19 +32,19 @@ from django.utils import timezone
 from django.utils.functional import cached_property
 from django.utils.html import format_html
 from django.utils.translation import ugettext_lazy as _
-from enum import Enum
 from guardian.shortcuts import get_users_with_perms
 from select2 import fields as select2_fields
-from serviceform.tasks.models import Task
-from typing import Tuple, Set, Optional, Sequence, Iterator, Iterable, TYPE_CHECKING
 
-from .email import EmailTemplate
-from .mixins import CopyMixin
-from .participation import QuestionAnswer
-from .people import Participant, ResponsibilityPerson
+from serviceform.tasks.models import Task
+
 from .. import emails, utils
 from ..utils import ColorStr
 
+from .mixins import CopyMixin
+from .people import Participant, ResponsibilityPerson
+from .email import EmailTemplate
+from .participation import QuestionAnswer
+
 if TYPE_CHECKING:
     from .participation import ParticipationActivity, ParticipationActivityChoice
 

python/testData/refactoring/move/relativeImportsInsideMovedModule/after/src/subpkg1/mod1.py

@@ -1,15 +1,15 @@
-import
-# malformed imports
-from
-from
-
-# absolute imports
-import pkg1.subpkg2 as foo
 from pkg1 import subpkg2
-from pkg1 import subpkg2 as bar
-from pkg1.subpkg2 import
 from pkg1.subpkg2 import mod2
 from pkg1.subpkg2.mod2 import VAR
 from . import mod3
 
+# malformed imports
+from
+from import
+from pkg1.subpkg2 import
+
+# absolute imports
+import pkg1.subpkg2 as foo
+from pkg1 import subpkg2 as bar
+
 print(subpkg2, mod3, mod2, foo, bar, VAR)

python/testData/refactoring/move/relativeImportsToModulesInSameMovedPackageNotUpdated/after/src/subpkg/m1.py

@@ -1,8 +1,8 @@
+from . import m2
 import m3
 import subsubpkg as foo
-from pkg import m5
-from . import m2
 from . import subsubpkg as bar
 from .subsubpkg import m4
+from pkg import m5
 
 print(m2, m3, m4, m5, foo, bar)

python/testData/refactoring/pullup/fieldMove/Class.after.py

@@ -1,6 +1,5 @@
 from SuperClass import SuperClass
 
-
 class AnyClass(SuperClass):
 
     def __init__(self):