From a9f177e722d80ecbacb0c8e74ea0e8a4b88212be Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 21 Mar 2021 15:13:08 +0100 Subject: Reverted reset_namespace idea. Didn't turn out as clean as I wanted it to. --- archinstall/lib/profiles.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'archinstall/lib') diff --git a/archinstall/lib/profiles.py b/archinstall/lib/profiles.py index 8284bf40..a0f2dc77 100644 --- a/archinstall/lib/profiles.py +++ b/archinstall/lib/profiles.py @@ -125,9 +125,7 @@ class Script(): else: raise ProfileNotFound(f"Cannot handle scheme {parsed_url.scheme}") - def load_instructions(self, namespace=None, reset_namespace=False): - original_namespace = self.namespace - + def load_instructions(self, namespace=None): if namespace: self.namespace = namespace @@ -137,12 +135,6 @@ class Script(): print(f"Imported {self} into sys.modules with namespace {self.namespace}") - if '.py' not in self.namespace: - raise KeyError(f"Debugging: {self.namespace}, {reset_namespace}, {self}") - - if reset_namespace: - self.namespace = original_namespace - return self def execute(self): @@ -181,7 +173,7 @@ class Profile(Script): # if __name__ == 'moduleName' if '__name__' in source_data and '_prep_function' in source_data: print(f"Checking if {self} has _prep_function by importing with namespace {self.namespace}.py") - with self.load_instructions(namespace=f"{self.namespace}.py", reset_namespace=True) as imported: + with self.load_instructions(namespace=f"{self.namespace}.py") as imported: if hasattr(imported, '_prep_function'): return True return False -- cgit v1.2.3-54-g00ecf