projects
/
python_utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop trying to cache mac addresses from house and cabin in the same
[python_utils.git]
/
bootstrap.py
diff --git
a/bootstrap.py
b/bootstrap.py
index 98da78cf6c1755c5fc3f5e42379e8d900abb10b7..c89952a838dfb345acbc5cc2f2567d5c028a3287 100644
(file)
--- a/
bootstrap.py
+++ b/
bootstrap.py
@@
-1,19
+1,20
@@
#!/usr/bin/env python3
import functools
#!/usr/bin/env python3
import functools
+import importlib
import logging
import os
import logging
import os
-import
importlib
+import
sys
from inspect import stack
from typing import List
from inspect import stack
from typing import List
-import sys
+
+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.
# 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__)
logger = logging.getLogger(__name__)
@@
-123,9
+124,7
@@
class ImportInterceptor(importlib.abc.MetaPathFinder):
return 'importlib' in filename or 'six.py' in filename
def find_module(self, fullname, path):
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."
- )
+ 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()
def find_spec(self, loaded_module, path=None, target=None):
s = stack()
@@
-229,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...)
# 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)
config.parse(entry_point.__globals__['__file__'])
else:
config.parse(None)