- Prevent deprecation warning by using importlib (fixes #24)

zopefoundation · Apr 7, 2019 · 407a550 · 407a550
1 parent 14351bf
commit 407a550
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog
 4.5 (unreleased)
 ----------------
 
+- Prevent deprecation warning by using ``importlib`` instead of ``imp``
+  (`#24 <https://github.com/zopefoundation/Products.PythonScripts/issues/24>`_)
+
 - Prevent syntax warning due to outdated default script content
   (`#26 <https://github.com/zopefoundation/Products.PythonScripts/issues/26>`_)
 

diff --git a/src/Products/PythonScripts/PythonScript.py b/src/Products/PythonScripts/PythonScript.py
@@ -16,7 +16,6 @@
 Python code.
 """
 
-import imp  # NOQA
 import marshal
 import os
 import re
@@ -54,8 +53,14 @@
 LOG = getLogger('PythonScripts')
 
 # Track the Python bytecode version
-Python_magic = imp.get_magic()
-del imp
+try:
+    import importlib.util
+    Python_magic = importlib.util.MAGIC_NUMBER
+    del importlib.util
+except ImportError:  # Python 2
+    import imp
+    Python_magic = imp.get_magic()
+    del imp
 
 # This should only be incremented to force recompilation.
 Script_magic = 4