X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=bootstrap.py;h=c89952a838dfb345acbc5cc2f2567d5c028a3287;hb=aca44b9aff1ea315c18b80a1c543f4e9b79fc9b0;hp=e50cb386543aaef66fdd36cb9c149fbf009ef5ae;hpb=cba792bceda56c05b3427d6e44a9aeed7111eb8b;p=python_utils.git

diff --git a/bootstrap.py b/bootstrap.py
index e50cb38..c89952a 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -1,17 +1,20 @@
 #!/usr/bin/env python3
 
 import functools
+import importlib
 import logging
 import os
-from inspect import stack
 import sys
+from inspect import stack
+from typing import List
+
+import config
+import logging_utils
+from argparse_utils import ActionNoYes
 
 # This module is commonly used by others in here and should avoid
 # taking any unnecessary dependencies back on them.
 
-from argparse_utils import ActionNoYes
-import config
-import logging_utils
 
 logger = logging.getLogger(__name__)
 
@@ -99,7 +102,7 @@ def handle_uncaught_exception(exc_type, exc_value, exc_tb):
                 original_hook(exc_type, exc_value, exc_tb)
 
 
-class ImportInterceptor(object):
+class ImportInterceptor(importlib.abc.MetaPathFinder):
     def __init__(self):
         import collect.trie
 
@@ -120,6 +123,9 @@ class ImportInterceptor(object):
     def should_ignore_filename(self, filename: str) -> bool:
         return 'importlib' in filename or 'six.py' in filename
 
+    def find_module(self, fullname, path):
+        raise Exception("This method has been deprecated since Python 3.4, please upgrade.")
+
     def find_spec(self, loaded_module, path=None, target=None):
         s = stack()
         for x in range(3, len(s)):
@@ -147,6 +153,9 @@ class ImportInterceptor(object):
         logger.debug(msg)
         print(msg)
 
+    def invalidate_caches(self):
+        pass
+
     def find_importer(self, module: str):
         if module in self.tree_node_by_module:
             node = self.tree_node_by_module[module]
@@ -166,7 +175,7 @@ import_interceptor = None
 for arg in sys.argv:
     if arg == '--audit_import_events':
         import_interceptor = ImportInterceptor()
-        sys.meta_path = [import_interceptor] + sys.meta_path
+        sys.meta_path.insert(0, import_interceptor)
 
 
 def dump_all_objects() -> None:
@@ -219,10 +228,7 @@ def initialize(entry_point):
         # Try to figure out the name of the program entry point.  Then
         # parse configuration (based on cmdline flags, environment vars
         # etc...)
-        if (
-            '__globals__' in entry_point.__dict__
-            and '__file__' in entry_point.__globals__
-        ):
+        if '__globals__' in entry_point.__dict__ and '__file__' in entry_point.__globals__:
             config.parse(entry_point.__globals__['__file__'])
         else:
             config.parse(None)