Merge pull request #2621 from Lucas-C/fix_module_import_caching_bug

Fix pelican.settings.load_source to avoid caching issues
getpelican · Sep 23, 2019 · ce87857 · ce87857
2 parents ac1e07a + 367245c
commit ce87857
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -0,0 +1,3 @@
+Release type: patch
+
+Fix pelican.settings.load_source to avoid caching issues - PR #2621
diff --git a/pelican/settings.py b/pelican/settings.py
@@ -14,12 +14,16 @@
 
 from pelican.log import LimitFilter
 
+
 try:
-    # SourceFileLoader is the recommended way in Python 3.3+
-    from importlib.machinery import SourceFileLoader
+    # spec_from_file_location is the recommended way in Python 3.5+
+    import importlib.util
 
     def load_source(name, path):
-        return SourceFileLoader(name, path).load_module()
+        spec = importlib.util.spec_from_file_location(name, path)
+        mod = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(mod)
+        return mod
 except ImportError:
     # but it does not exist in Python 2.7, so fall back to imp
     import imp
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Release type: patch

		Fix pelican.settings.load_source to avoid caching issues - PR #2621