Changeset 103325 in vbox for trunk/src/VBox/Installer/common

Timestamp:

Feb 13, 2024 12:40:49 AM (11 months ago)

Author:

vboxsync

Message:

Installer/vboxapisetup*.py: Some pylint nits. Removed some unnecessary newline escaping and such. bugref:10579

Location:

trunk/src/VBox/Installer/common

Files:

• vboxapisetup-stub.py (modified) (1 diff)
• vboxapisetup.py (modified) (9 diffs)

trunk/src/VBox/Installer/common/vboxapisetup-stub.py

@@ -37 +37 @@
     import sys
     try:
-        sys.path.append("vboxapi")
+        sys.path.append("vboxapi") # ASSUMES that the CWD is the same as the script directory. This has always been the case.
         import setup
         sys.exit(setup.main())
-    except ImportError as exc:
-        print("VBox Python API binding sources not found: %s" % (exc))
+    except ImportError as oXcpt:
+        print("VBox Python API binding sources not found: %s" % (oXcpt,))
     sys.exit(1)

trunk/src/VBox/Installer/common/vboxapisetup.py

@@ -136 +136 @@
         oVBox    = oVBoxMgr.getVirtualBox()
         oHost    = oVBox.host
-        if oHost.architecture not in (oVBoxMgr.constants.PlatformArchitecture_x86, \
+        if oHost.architecture not in (oVBoxMgr.constants.PlatformArchitecture_x86,
                                       oVBoxMgr.constants.PlatformArchitecture_ARM):
             raise Exception('Host platform invalid!')
@@ -144 +144 @@
         del oVBoxMgr
     except ImportError as exc:
-        print("ERROR: Testing VirtualBox Python bindings failed: %s" % (exc))
+        print("ERROR: Testing VirtualBox Python bindings failed: %s" % (exc,))
         return False
 
-    print("Installation of VirtualBox Python bindings for Python %d.%d successful." \
+    print("Installation of VirtualBox Python bindings for Python %d.%d successful."
           % (sys.version_info.major, sys.version_info.minor))
     return True
 
-def findModulePathHelper(sModule = 'vboxapi', aDir = sys.path):
+def findModulePathHelper(sModule = 'vboxapi', asDirs = None):
     """
     Helper function for findModulePath.
@@ -157 +157 @@
     Returns the path found, or None if not found.
     """
-    for sPath in aDir:
+    if asDirs is None:
+        asDirs = sys.path;
+    for sPath in asDirs:
         if g_fVerbose:
             print('Searching for "%s" in path "%s" ...' % (sModule, sPath))
+        ## @todo r=bird: WOW. We read the directory and then look for a filename in the returned list?!? Case sensitively.
+        ##  What about:
+        ## if g_fVerbose: # drop this
+        ##     print(os.listdir(sPath));
+        ## sCandiate = os.path.join(sPath, sModule);
+        ## if os.path.exists(sCandiate):
+        ##     return sCandiate;
         if os.path.isdir(sPath):
-            aDirEntries = os.listdir(sPath)
+            asDirEntries = os.listdir(sPath)
             if g_fVerbose:
-                print(aDirEntries)
-            if sModule in aDirEntries:
+                print(asDirEntries)
+            if sModule in asDirEntries:
                 return os.path.join(sPath, sModule)
     return None
@@ -188 +197 @@
     pass
 
-class setupInstallClass(install):
+class VBoxSetupInstallClass(install):
     """
     Class which overrides the "install" command of the setup so that we can
@@ -210 +219 @@
     # Deprecation warning for older Python stuff (< Python 3.x).
     if sys.version_info.major < 3:
-        print("\nWarning: Running VirtualBox with Python %d.%d is marked as being deprecated.\n" \
-              "Please upgrade your Python installation to avoid breakage.\n" \
-              % (sys.version_info.major, sys.version_info.minor))
+        print("\nWarning: Running VirtualBox with Python %d.%d is marked as being deprecated.\n"
+              "Please upgrade your Python installation to avoid breakage.\n"
+              % (sys.version_info.major, sys.version_info.minor,))
 
     sVBoxInstallPath = os.environ.get("VBOX_MSI_INSTALL_PATH", None)
@@ -247 +256 @@
         #              Better would be patching the *installed* module instead of the original module.
         sVBoxSdkPath = os.path.join(sVBoxInstallPath, "sdk")
-        fRc = patchWith(os.path.join(sCurDir, 'src', 'vboxapi', '__init__.py'), \
-                        sVBoxInstallPath, sVBoxSdkPath)
+        fRc = patchWith(os.path.join(sCurDir, 'src', 'vboxapi', '__init__.py'), sVBoxInstallPath, sVBoxSdkPath)
         if not fRc:
             return 1
@@ -266 +274 @@
                 print("ERROR: setuptools package not installed, can't continue. Exiting.")
                 return 1
-            setup(cmdclass={"install": setupInstallClass})
+            setup(cmdclass = { "install": VBoxSetupInstallClass, })
         else:
             try:
@@ -279 +287 @@
                     print("Invoking setuptools directly ...")
                 setupTool = setup(name='vboxapi',
-                            version=sVBoxVersion,
-                            description='Python interface to VirtualBox',
-                            author='Oracle Corp.',
-                            author_email='[email protected]',
-                            url='https://www.virtualbox.org',
-                            package_dir={'': 'src'},
-                            packages=['vboxapi'])
+                                  version=sVBoxVersion,
+                                  description='Python interface to VirtualBox',
+                                  author='Oracle Corp.',
+                                  author_email='[email protected]',
+                                  url='https://www.virtualbox.org',
+                                  package_dir={'': 'src'},
+                                  packages=['vboxapi'])
                 if setupTool:
                     sPathInstalled = setupTool.command_obj['install'].install_lib
                     if sPathInstalled not in sys.path:
-                        print("\nWARNING: Installation path is not in current module search path!")
-                        print("         This might happen on OSes / distributions which only maintain packages by")
-                        print("         a vendor-specific method.")
+                        print("");
+                        print("WARNING: Installation path is not in current module search path!")
+                        print("         This might happen on OSes / distributions which only maintain ")
+                        print("         packages by a vendor-specific method.")
                         print("Hints:")
                         print("- Check how the distribution handles user-installable Python packages.")
@@ -304 +313 @@
 
     except RuntimeError as exc:
-        print("ERROR: Installation of VirtualBox Python bindings failed: %s" % (exc))
+        print("ERROR: Installation of VirtualBox Python bindings failed: %s" % (exc,))
         return 1