Cleanup MSCommon/vc imports and move Dispatcher imports and registration

10 files changed, 18 insertions, 18 deletions

diff --git a/SCons/Tool/MSCommon/MSVC/Config.py b/SCons/Tool/MSCommon/MSVC/Config.py
index 476dcb3..8f3a2cc 100644
--- a/SCons/Tool/MSCommon/MSVC/Config.py
+++ b/SCons/Tool/MSCommon/MSVC/Config.py
@@ -30,9 +30,9 @@ from collections import (
 )
 
 from . import Dispatcher
-
 Dispatcher.register_modulename(__name__)
 
+
 UNDEFINED = object()
 
 BOOLEAN_SYMBOLS = {}
diff --git a/SCons/Tool/MSCommon/MSVC/Dispatcher.py b/SCons/Tool/MSCommon/MSVC/Dispatcher.py
index ebcd704..0b216ca 100644
--- a/SCons/Tool/MSCommon/MSVC/Dispatcher.py
+++ b/SCons/Tool/MSCommon/MSVC/Dispatcher.py
@@ -31,6 +31,7 @@ from ..common import (
     debug,
 )
 
+
 _refs = []
 
 def register_class(ref):
diff --git a/SCons/Tool/MSCommon/MSVC/NotFound.py b/SCons/Tool/MSCommon/MSVC/NotFound.py
index 7abe5ad..6ade285 100644
--- a/SCons/Tool/MSCommon/MSVC/NotFound.py
+++ b/SCons/Tool/MSCommon/MSVC/NotFound.py
@@ -36,15 +36,16 @@ from ..common import (
     debug,
 )
 
-from . import Dispatcher
 from . import Config
 
 from .Exceptions import (
     MSVCVersionNotFound,
 )
 
+from . import Dispatcher
 Dispatcher.register_modulename(__name__)
 
+
 _MSVC_NOTFOUND_POLICY_DEF = Config.MSVC_NOTFOUND_POLICY_INTERNAL['warning']
 
 def _msvc_notfound_policy_lookup(symbol):
diff --git a/SCons/Tool/MSCommon/MSVC/Registry.py b/SCons/Tool/MSCommon/MSVC/Registry.py
index 848b125..f9a5eb2 100644
--- a/SCons/Tool/MSCommon/MSVC/Registry.py
+++ b/SCons/Tool/MSCommon/MSVC/Registry.py
@@ -39,11 +39,12 @@ from .. common import (
     read_reg,
 )
 
-from . import Dispatcher
 from . import Util
 
+from . import Dispatcher
 Dispatcher.register_modulename(__name__)
 
+
 def read_value(hkey, subkey_valname):
     try:
         rval = read_reg(subkey_valname, hkroot=hkey)
diff --git a/SCons/Tool/MSCommon/MSVC/ScriptArguments.py b/SCons/Tool/MSCommon/MSVC/ScriptArguments.py
index 324f8be..1b02396 100644
--- a/SCons/Tool/MSCommon/MSVC/ScriptArguments.py
+++ b/SCons/Tool/MSCommon/MSVC/ScriptArguments.py
@@ -37,7 +37,6 @@ from ..common import (
     debug,
 )
 
-from . import Dispatcher
 from . import Util
 from . import Config
 from . import WinSDK
@@ -47,8 +46,10 @@ from .Exceptions import (
     MSVCArgumentError,
 )
 
+from . import Dispatcher
 Dispatcher.register_modulename(__name__)
 
+
 # TODO: verify SDK 10 version folder names 10.0.XXXXX.0 {1,3} last?
 re_sdk_version_100 = re.compile(r'^10[.][0-9][.][0-9]{5}[.][0-9]{1}$')
 re_sdk_version_81 = re.compile(r'^8[.]1$')
diff --git a/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py b/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py
index 8a79007..8b9faa9 100644
--- a/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py
+++ b/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py
@@ -44,9 +44,9 @@ from .. common import (
 )
 
 from . import Dispatcher
-
 Dispatcher.register_modulename(__name__)
 
+
 class _Data:
 
     separator = r';'
diff --git a/SCons/Tool/MSCommon/MSVC/WinSDK.py b/SCons/Tool/MSCommon/MSVC/WinSDK.py
index e95c72e..bd8d9b0 100644
--- a/SCons/Tool/MSCommon/MSVC/WinSDK.py
+++ b/SCons/Tool/MSCommon/MSVC/WinSDK.py
@@ -31,7 +31,6 @@ from ..common import (
     debug,
 )
 
-from . import Dispatcher
 from . import Util
 from . import Config
 from . import Registry
@@ -40,8 +39,10 @@ from .Exceptions import (
     MSVCInternalError,
 )
 
+from . import Dispatcher
 Dispatcher.register_modulename(__name__)
 
+
 def _new_sdk_map():
     sdk_map = {
         'desktop': [],
diff --git a/SCons/Tool/MSCommon/MSVC/__init__.py b/SCons/Tool/MSCommon/MSVC/__init__.py
index afd993f..1341415 100644
--- a/SCons/Tool/MSCommon/MSVC/__init__.py
+++ b/SCons/Tool/MSCommon/MSVC/__init__.py
@@ -28,8 +28,6 @@ Functions for Microsoft Visual C/C++.
 from . import Exceptions
 from . import Util
 
-from . import Dispatcher as _Dispatcher
-
 from . import Config
 from . import Registry
 from . import SetupEnvDefault
@@ -37,10 +35,7 @@ from . import NotFound
 from . import WinSDK
 from . import ScriptArguments
 
-from .NotFound import (
-    set_msvc_notfound_policy,
-    get_msvc_notfound_policy,
-)
+from . import Dispatcher as _Dispatcher
 
 def reset():
     _Dispatcher.reset()
diff --git a/SCons/Tool/MSCommon/__init__.py b/SCons/Tool/MSCommon/__init__.py
index 9f35e94..7900a87 100644
--- a/SCons/Tool/MSCommon/__init__.py
+++ b/SCons/Tool/MSCommon/__init__.py
@@ -32,18 +32,12 @@ import SCons.Util
 
 from SCons.Tool.MSCommon.sdk import mssdk_exists, mssdk_setup_env
 
-from SCons.Tool.MSCommon.MSVC import (
-    set_msvc_notfound_policy,
-    get_msvc_notfound_policy,
-)
-
 from SCons.Tool.MSCommon.vc import (
     msvc_exists,
     msvc_setup_env_tool,
     msvc_setup_env_once,
     msvc_version_to_maj_min,
     msvc_find_vswhere,
-    get_msvc_sdk_versions,
 )
 
 from SCons.Tool.MSCommon.vs import (
diff --git a/SCons/Tool/MSCommon/vc.py b/SCons/Tool/MSCommon/vc.py
index 2e5d542..a2e8e42 100644
--- a/SCons/Tool/MSCommon/vc.py
+++ b/SCons/Tool/MSCommon/vc.py
@@ -61,10 +61,16 @@ from .common import CONFIG_CACHE, debug
 from .sdk import get_installed_sdks
 
 from . import MSVC
+
 from .MSVC.Exceptions import (
     VisualCException
 )
 
+from .MSVC.NotFound import (
+    set_msvc_notfound_policy,
+    get_msvc_notfound_policy,
+)
+
 class UnsupportedVersion(VisualCException):
     pass