Adjust injector module

1. ensure python 3.13 compatibility with regards to `__file__` vs. `__spec__`
2. ensure module produces same behavior on all available plugin_hosts
3. remove writing `__spec__` as it has no effect. Final value always contains
   information from original injector module.
4. as no sublime API is required, install injector module at import time
   so it is eventually available earlier.
5. ensure injector module is also re-installed in cases, the original one
   causes import errors in package_disabler module, auto-repair so to say.

Author: deathaxe

package_control/bootstrap.py

@@ -46,8 +46,6 @@ def bootstrap():
     by `plugin_loaded()` hook.
     """
 
-    _install_injectors()
-
     if not os.path.exists(LOADER_PACKAGE_PATH):
         # Start shortly after Sublime starts so package renames don't cause errors
         # with key bindings, settings, etc. disappearing in the middle of parsing
@@ -131,25 +129,28 @@ def _install_injectors():
     Makes sure the module injectors are in place
     """
 
-    injector_code = R"""
+    injector_code = R'''
+        """
+        Public Package Control API
+        """
         import os
         import sys
         import zipfile
 
         import sublime_plugin
 
-        __data_path = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
-
+        # python 3.13 may no longer provide __file__
+        __data_path = os.path.dirname(os.path.dirname(os.path.dirname(
+            __spec__.origin if hasattr(globals(), '__spec__') else __file__))
+        )
         __pkg_path = os.path.join(__data_path, 'Packages', 'Package Control', 'package_control')
         __zip_path = os.path.join(__data_path, 'Installed Packages', 'Package Control.sublime-package')
-
         __code = None
 
         # We check the .sublime-package first, since the sublime_plugin.ZipLoader deals with overrides
         if os.path.exists(__zip_path):
             __pkg_path = os.path.join(__zip_path, 'package_control')
             __file_path = os.path.join(__pkg_path, '__init__.py')
-
             __loader__ = sublime_plugin.ZipLoader(__zip_path)
 
             try:
@@ -162,7 +163,7 @@ def _install_injectors():
             except (OSError, KeyError):
                 pass
 
-            # may be required before Package Control has been loaded
+            # required for events to be available on plugin_host Package Control is not running on
             events = sys.modules.get('package_control.events')
             if events is None:
                 events = __loader__.load_module("Package Control.package_control.events")
@@ -174,7 +175,6 @@ def _install_injectors():
             from importlib.machinery import SourceFileLoader
 
             __file_path = os.path.join(__pkg_path, '__init__.py')
-
             __loader__ = SourceFileLoader('package_control', __file_path)
 
             try:
@@ -183,7 +183,7 @@ def _install_injectors():
             except (OSError):
                 pass
 
-            # may be required before Package Control has been loaded
+            # required for events to be available on plugin_host Package Control is not running on
             events = sys.modules.get('package_control.events')
             if events is None:
                 events = SourceFileLoader('events', os.path.join(__pkg_path, 'events.py')).load_module()
@@ -198,36 +198,25 @@ def _install_injectors():
 
         __file__ = __file_path
         __package__ = 'package_control'
-        __path__ = [__pkg_path]
+        __path__ = []
+        __data = {}
+        exec(__code, __data)
+        globals().update(__data)
 
-        # initial cleanup
+        # cleanup temporary globals
+        del globals()['__cached__']
+        del globals()['__code']
+        del globals()['__data']
+        del globals()['__data_path']
         del globals()['__f']
         del globals()['__file_path']
-        del globals()['__zip_path']
         del globals()['__pkg_path']
-        del globals()['__data_path']
+        del globals()['__zip_path']
+        del globals()['os']
         del globals()['sublime_plugin']
-        del globals()['zipfile']
         del globals()['sys']
-        del globals()['os']
-
-        __data = {}
-        exec(__code, __data)
-        globals().update(__data)
-
-        # Python 3.3 doesn't have __spec__
-        if hasattr(globals(), '__spec__'):
-            __spec__.loader = __loader__
-            __spec__.origin = __file__
-            __spec__.submodule_search_locations = __path__
-            __spec__.cached = None
-
-        # final cleanup
-        del globals()['__data']
-        del globals()['__code']
-        # out-dated internals
-        del globals()['__cached__']
-    """
+        del globals()['zipfile']
+    '''
 
     injector_code = dedent(injector_code).lstrip()
     injector_code = injector_code.encode('utf-8')
@@ -249,3 +238,5 @@ def _install_injectors():
             pass
         except OSError as e:
             console_write('Unable to write injector to "%s" - %s' % (injector_path, e))
+
+_install_injectors()

package_control/package_disabler.py

@@ -8,7 +8,7 @@
     # Relative import does not work here due to hard loading events
     # into global package_control (see bootstrap.py)!
     from package_control import events
-except ImportError:
+except Exception:
     # use relative import, if bootstrapping has not yet been completed
     from . import events