From: Ben Steffen <bds@mit.edu>
Date: Tue, 26 Nov 2019 21:09:15 +0000 (-0500)
Subject: Use regular import instead of wildcard import
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-base.git/commitdiff_plain/c0cb9a2013e343daaec5d7c29ebea97d69fa8f7f

Use regular import instead of wildcard import
---

diff --git a/python/invirt/config.py b/python/invirt/config.py
index ae960b1..76c848a 100644
--- a/python/invirt/config.py
+++ b/python/invirt/config.py
@@ -3,7 +3,7 @@ import os
 import re
 
 import yaml
-from invirt.common import *
+import invirt.common
 
 try:    loader = yaml.CSafeLoader
 except: loader = yaml.SafeLoader
@@ -128,7 +128,7 @@ def load(force_refresh = False):
         # transactionally isolated from the above cache read.  If we fail to
         # acquire the lock, just try to load the master configuration.
         try:
-            with lock_file(lock_path):
+            with invirt.common.open_locked(lock_path):
                 ns.cfg = load_master()
                 try: 
                     with open(cache_path + '.tmp', 'w') as f: