Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b28dbb3

Browse files
mtsokolmtsokol
committed
Rename function_base import
1 parent 5dfd5a3 commit b28dbb3

File tree

7 files changed

+25
-30
lines changed

7 files changed

+25
-30
lines changed

‎numpy/__init__.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ from numpy.lib.arraysetops import (
412412
isin as isin,
413413
)
414414

415-
from numpy.lib.function_base import (
415+
from numpy.lib._function_base_impl import (
416416
select as select,
417417
piecewise as piecewise,
418418
trim_zeros as trim_zeros,

‎numpy/lib/_nanfunctions_impl.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import functools
2424
import warnings
2525
import numpy as np
26-
from numpy.lib import function_base
26+
from numpy.lib import _function_base_impl as fnb
2727
from numpy.core import overrides
2828

2929

@@ -1213,9 +1213,9 @@ def nanmedian(a, axis=None, out=None, overwrite_input=False, keepdims=np._NoValu
12131213
if a.size == 0:
12141214
return np.nanmean(a, axis, out=out, keepdims=keepdims)
12151215

1216-
return function_base._ureduce(a, func=_nanmedian, keepdims=keepdims,
1217-
axis=axis, out=out,
1218-
overwrite_input=overwrite_input)
1216+
return fnb._ureduce(a, func=_nanmedian, keepdims=keepdims,
1217+
axis=axis, out=out,
1218+
overwrite_input=overwrite_input)
12191219

12201220

12211221
def _nanpercentile_dispatcher(
@@ -1368,7 +1368,7 @@ def nanpercentile(
13681368
13691369
"""
13701370
if interpolation is not None:
1371-
method = function_base._check_interpolation_as_method(
1371+
method = fnb._check_interpolation_as_method(
13721372
method, interpolation, "nanpercentile")
13731373

13741374
a = np.asanyarray(a)
@@ -1378,7 +1378,7 @@ def nanpercentile(
13781378
q = np.true_divide(q, 100.0)
13791379
# undo any decay that the ufunc performed (see gh-13105)
13801380
q = np.asanyarray(q)
1381-
if not function_base._quantile_is_valid(q):
1381+
if not fnb._quantile_is_valid(q):
13821382
raise ValueError("Percentiles must be in the range [0, 100]")
13831383
return _nanquantile_unchecked(
13841384
a, q, axis, out, overwrite_input, method, keepdims)
@@ -1531,15 +1531,15 @@ def nanquantile(
15311531
"""
15321532

15331533
if interpolation is not None:
1534-
method = function_base._check_interpolation_as_method(
1534+
method = fnb._check_interpolation_as_method(
15351535
method, interpolation, "nanquantile")
15361536

15371537
a = np.asanyarray(a)
15381538
if a.dtype.kind == "c":
15391539
raise TypeError("a must be an array of real numbers")
15401540

15411541
q = np.asanyarray(q)
1542-
if not function_base._quantile_is_valid(q):
1542+
if not fnb._quantile_is_valid(q):
15431543
raise ValueError("Quantiles must be in the range [0, 1]")
15441544
return _nanquantile_unchecked(
15451545
a, q, axis, out, overwrite_input, method, keepdims)
@@ -1559,14 +1559,14 @@ def _nanquantile_unchecked(
15591559
# so deal them upfront
15601560
if a.size == 0:
15611561
return np.nanmean(a, axis, out=out, keepdims=keepdims)
1562-
return function_base._ureduce(a,
1563-
func=_nanquantile_ureduce_func,
1564-
q=q,
1565-
keepdims=keepdims,
1566-
axis=axis,
1567-
out=out,
1568-
overwrite_input=overwrite_input,
1569-
method=method)
1562+
return fnb._ureduce(a,
1563+
func=_nanquantile_ureduce_func,
1564+
q=q,
1565+
keepdims=keepdims,
1566+
axis=axis,
1567+
out=out,
1568+
overwrite_input=overwrite_input,
1569+
method=method)
15701570

15711571

15721572
def _nanquantile_ureduce_func(a, q, axis=None, out=None, overwrite_input=False,
@@ -1604,7 +1604,7 @@ def _nanquantile_1d(arr1d, q, overwrite_input=False, method="linear"):
16041604
# convert to scalar
16051605
return np.full(q.shape, np.nan, dtype=arr1d.dtype)[()]
16061606

1607-
return function_base._quantile_unchecked(
1607+
return fnb._quantile_unchecked(
16081608
arr1d, q, overwrite_input=overwrite_input, method=method)
16091609

16101610

‎numpy/lib/_nanfunctions_impl.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ from numpy.core.fromnumeric import (
1212
std
1313
)
1414

15-
from numpy.lib.function_base import (
15+
from numpy.lib._function_base_impl import (
1616
median,
1717
percentile,
1818
quantile,

‎numpy/lib/polynomial.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from numpy.core import overrides
1919
from numpy.exceptions import RankWarning
2020
from numpy.lib.twodim_base import diag, vander
21-
from numpy.lib.function_base import trim_zeros
21+
from numpy.lib._function_base_impl import trim_zeros
2222
from numpy.lib.type_check import iscomplex, real, imag, mintypecode
2323
from numpy.linalg import eigvals, lstsq, inv
2424

‎numpy/ma/core.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@
3232
import numpy.core.umath as umath
3333
import numpy.core.numerictypes as ntypes
3434
from numpy.core import multiarray as mu
35-
from numpy import ndarray, amax, amin, iscomplexobj, bool_, _NoValue
36-
from numpy import array as narray
37-
from numpy.lib.function_base import angle
38-
from numpy import expand_dims
35+
from numpy import ndarray, amax, amin, iscomplexobj, bool_, _NoValue, angle
36+
from numpy import array as narray, expand_dims
3937
from numpy.core.numeric import normalize_axis_tuple
4038
from numpy._utils._inspect import getargspec, formatargspec
4139

@@ -1206,7 +1204,7 @@ def __call__(self, a, b, *args, **kwargs):
12061204
cosh = _MaskedUnaryOperation(umath.cosh)
12071205
tanh = _MaskedUnaryOperation(umath.tanh)
12081206
abs = absolute = _MaskedUnaryOperation(umath.absolute)
1209-
angle = _MaskedUnaryOperation(angle) # from numpy.lib.function_base
1207+
angle = _MaskedUnaryOperation(angle)
12101208
fabs = _MaskedUnaryOperation(umath.fabs)
12111209
negative = _MaskedUnaryOperation(umath.negative)
12121210
floor = _MaskedUnaryOperation(umath.floor)

‎numpy/ma/core.pyi‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ from numpy import (
1212
ones_like as ones_like,
1313
squeeze as squeeze,
1414
zeros_like as zeros_like,
15-
)
16-
17-
from numpy.lib.function_base import (
18-
angle as angle,
15+
angle as angle
1916
)
2017

2118
# TODO: Set the `bound` to something more suitable once we

‎numpy/ma/extras.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from numpy import ndarray, array as nxarray
3535
from numpy.core.multiarray import normalize_axis_index
3636
from numpy.core.numeric import normalize_axis_tuple
37-
from numpy.lib.function_base import _ureduce
37+
from numpy.lib._function_base_impl import _ureduce
3838
from numpy.lib.index_tricks import AxisConcatenator
3939

4040

0 commit comments

Comments
 (0)