Something went wrong. Try again.
What happens if I push all of nixpkgs
Something went wrong. Try again.
2.0 kB · 63 lines
at master
12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364diff --git a/astropy_helpers/tests/test_git_helpers.py b/astropy_helpers/tests/test_git_helpers.pyindex 6b826fc..3fb3a29 100644--- a/astropy_helpers/tests/test_git_helpers.py+++ b/astropy_helpers/tests/test_git_helpers.py@@ -1,5 +1,5 @@ import glob-import imp+import importlib as imp import os import pkgutil import rediff --git a/astropy_helpers/utils.py b/astropy_helpers/utils.pyindex 115c915..0cfc9e3 100644--- a/astropy_helpers/utils.py+++ b/astropy_helpers/utils.py@@ -1,12 +1,12 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst import contextlib-import imp import os import sys import glob from importlib import machinery as import_machinery+from importlib import util as importlib_util # Note: The following Warning subclasses are simply copies of the Warnings in@@ -54,9 +54,9 @@ def get_numpy_include_path(): import builtins if hasattr(builtins, '__NUMPY_SETUP__'): del builtins.__NUMPY_SETUP__- import imp+ import importlib import numpy- imp.reload(numpy)+ importlib.reload(numpy) try: numpy_include = numpy.get_include()@@ -208,8 +208,6 @@ def import_file(filename, name=None): # generates an underscore-separated name which is more likely to # be unique, and it doesn't really matter because the name isn't # used directly here anyway.- mode = 'r'- if name is None: basename = os.path.splitext(filename)[0] name = '_'.join(os.path.relpath(basename).split(os.sep)[1:])@@ -221,8 +219,10 @@ def import_file(filename, name=None): 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))+ importlib_util+ spec = importlib_util.spec_from_file_location(name, filename)+ mod = importlib_util.module_from_spec(spec)+ spec.loader.exec_module(mod) return mod