Settings now don't fiddle with sys.path

Author: sametmax

zerobin/utils.py

@@ -14,6 +14,15 @@
 except (AttributeError):
     pass # privilege does't work on several plateform
 
+try:
+    from runpy import run_path
+except ImportError:
+    # python-2.6 or earlier - use simplier less-optimized execfile()
+    def run_path(file_path):
+        mod_globals = {'__file__': file_path}
+        execfile(file_path, mod_globals)
+        return mod_globals
+
 
 def drop_privileges(user=None, group=None, wait=5):
     """
@@ -72,17 +81,25 @@ def __new__(cls, *args, **kwargs):
         return cls._instance
 
 
-    def update_with_module(self, module):
+    def update_with_dict(self, dict):
         """
-            Update settings with values from the given module.
+            Update settings with values from the given mapping object.
             (Taking only variable with uppercased name)
         """
-        for name, value in module.__dict__.iteritems():
+        for name, value in dict.iteritems():
             if name.isupper():
                 setattr(self, name, value)
         return self
 
 
+    def update_with_module(self, module):
+        """
+            Update settings with values from the given module.
+            Uses update_with_dict() behind the scenes.
+        """
+        return self.update_with_dict(module.__dict__)
+
+
     @classmethod
     def from_module(cls, module):
         """
@@ -97,11 +114,10 @@ def from_module(cls, module):
     def update_with_file(self, filepath):
         """
             Update settings with values from the given module file.
-            User update_with_module() behind the scene
+            Uses update_with_dict() behind the scenes.
         """
-        sys.path.insert(0, os.path.dirname(filepath))
-        module_name = os.path.splitext(os.path.basename(filepath))[0]
-        return self.update_with_module(__import__(module_name))
+        settings = run_path(filepath)
+        return self.update_with_dict(settings)
 
 
 settings = SettingsContainer()