Skip to content

Commit

Permalink
Adjust imports after a rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
mtsokol committed Sep 20, 2023
1 parent 2fdf062 commit a7e8659
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions numpy/char/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from numpy.core.defchararray import __all__, __doc__
from numpy.core.defchararray import *
from numpy._core.defchararray import __all__, __doc__
from numpy._core.defchararray import *
2 changes: 1 addition & 1 deletion numpy/char/__init__.pyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from numpy.core.defchararray import (
from numpy._core.defchararray import (
equal as equal,
not_equal as not_equal,
greater_equal as greater_equal,
Expand Down
2 changes: 1 addition & 1 deletion numpy/ma/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ command-line option, e.g.::
Masked records
--------------

Like *numpy.core.ma*, the *ndarray*-based implementation
Like *numpy.ma.core*, the *ndarray*-based implementation
of MaskedArray is limited when working with records: you can
mask any record of the array, but not a field in a record. If you
need this feature, you may want to give the *mrecords* package
Expand Down
2 changes: 1 addition & 1 deletion numpy/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ pure_subdirs = [
'tests',
'typing',
'rec',
'char'
'char',
'core'
]
if py.version().version_compare('<3.12')
Expand Down
4 changes: 2 additions & 2 deletions numpy/rec/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from numpy.core.records import __all__, __doc__
from numpy.core.records import *
from numpy._core.records import __all__, __doc__
from numpy._core.records import *
2 changes: 1 addition & 1 deletion numpy/rec/__init__.pyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from numpy.core.records import (
from numpy._core.records import (
record as record,
recarray as recarray,
format_parser as format_parser,
Expand Down

0 comments on commit a7e8659

Please sign in to comment.