summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--numpy/compat/py3k.py3
-rw-r--r--numpy/core/umath.py2
-rw-r--r--numpy/distutils/mingw32ccompiler.py1
-rw-r--r--numpy/lib/function_base.py1
4 files changed, 6 insertions, 1 deletions
diff --git a/numpy/compat/py3k.py b/numpy/compat/py3k.py
index 85136ce87..e1e236d92 100644
--- a/numpy/compat/py3k.py
+++ b/numpy/compat/py3k.py
@@ -21,6 +21,9 @@ import os
from pathlib import Path
import io
+import abc
+from abc import ABC as abc_ABC
+
try:
import pickle5 as pickle
except ImportError:
diff --git a/numpy/core/umath.py b/numpy/core/umath.py
index c49fc1460..6a5474ffe 100644
--- a/numpy/core/umath.py
+++ b/numpy/core/umath.py
@@ -11,7 +11,7 @@ from ._multiarray_umath import * # noqa: F403
# These imports are needed for backward compatibility,
# do not change them. issue gh-11862
# _ones_like is semi-public, on purpose not added to __all__
-from ._multiarray_umath import _UFUNC_API, _add_newdoc_ufunc
+from ._multiarray_umath import _UFUNC_API, _add_newdoc_ufunc, _ones_like
__all__ = [
'_UFUNC_API', 'ERR_CALL', 'ERR_DEFAULT', 'ERR_IGNORE', 'ERR_LOG',
diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py
index c1e9937f4..4681d403b 100644
--- a/numpy/distutils/mingw32ccompiler.py
+++ b/numpy/distutils/mingw32ccompiler.py
@@ -15,6 +15,7 @@ import re
import textwrap
# Overwrite certain distutils.ccompiler functions:
+import numpy.distutils.ccompiler # noqa: F401
from numpy.distutils import log
# NT stuff
# 1. Make sure libpython<version>.a exists for gcc. If not, build it.
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index 709a33c84..783d45c2f 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -33,6 +33,7 @@ from numpy.core.umath import _add_newdoc_ufunc as add_newdoc_ufunc
import builtins
# needed in this module for compatibility
+from numpy.lib.histograms import histogram, histogramdd
array_function_dispatch = functools.partial(