summarylogtreecommitdiffstats
path: root/fix-importlib.patch
blob: 44a672ab8d2c426b1165ace81cf9069885b7279f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
From 9431edf2a6e4692bfbd9e6326f01288d61d414e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brigitta=20Sip=C5=91cz?= <bsipocz@gmail.com>
Date: Mon, 25 Sep 2023 15:07:58 -0700
Subject: [PATCH] imp --> importlib fixes

---
 astropy_helpers/utils.py                  | 13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/astropy_helpers/utils.py b/astropy_helpers/utils.py
index 115c9153..83da4151 100644
--- a/astropy_helpers/utils.py
+++ b/astropy_helpers/utils.py
@@ -1,11 +1,11 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
 import contextlib
-import imp
 import os
 import sys
 import glob
 
+import importlib
 from importlib import machinery as import_machinery
 
 
@@ -54,9 +54,8 @@ def get_numpy_include_path():
     import builtins
     if hasattr(builtins, '__NUMPY_SETUP__'):
         del builtins.__NUMPY_SETUP__
-    import imp
     import numpy
-    imp.reload(numpy)
+    importlib.reload(numpy)
 
     try:
         numpy_include = numpy.get_include()
@@ -217,12 +216,8 @@ def import_file(filename, name=None):
     if not os.path.exists(filename):
         raise ImportError('Could not import file {0}'.format(filename))
 
-    if import_machinery:
-        loader = import_machinery.SourceFileLoader(name, filename)
-        mod = loader.load_module()
-    else:
-        with open(filename, mode) as fd:
-            mod = imp.load_module(name, fd, filename, ('.py', mode, 1))
+    loader = import_machinery.SourceFileLoader(name, filename)
+    mod = loader.load_module()
 
     return mod