import array as pd_array

MarcoGorelli · MarcoGorelli · commit bec9a1091826 · 2021-03-12T10:36:02.000Z
diff --git a/pandas/core/algorithms.py b/pandas/core/algorithms.py
@@ -84,9 +84,9 @@
 
 from pandas.core.array_algos.take import take_nd
 from pandas.core.construction import (
+    array as pd_array,
     ensure_wrapped_if_datetimelike,
     extract_array,
-    pd_array,
 )
 from pandas.core.indexers import validate_indices
 
diff --git a/pandas/core/api.py b/pandas/core/api.py
@@ -43,7 +43,7 @@
     UInt64Dtype,
 )
 from pandas.core.arrays.string_ import StringDtype
-from pandas.core.construction import pd_array as array
+from pandas.core.construction import array
 from pandas.core.flags import Flags
 from pandas.core.groupby import (
     Grouper,
diff --git a/pandas/core/apply.py b/pandas/core/apply.py
@@ -52,8 +52,8 @@
 )
 import pandas.core.common as com
 from pandas.core.construction import (
+    array as pd_array,
     create_series_with_explicit_dtype,
-    pd_array,
 )
 
 if TYPE_CHECKING:
diff --git a/pandas/core/arrays/categorical.py b/pandas/core/arrays/categorical.py
@@ -97,8 +97,8 @@
 )
 import pandas.core.common as com
 from pandas.core.construction import (
+    array as pd_array,
     extract_array,
-    pd_array,
     sanitize_array,
 )
 from pandas.core.indexers import deprecate_ndim_indexing
diff --git a/pandas/core/arrays/datetimelike.py b/pandas/core/arrays/datetimelike.py
@@ -107,8 +107,8 @@
 )
 import pandas.core.common as com
 from pandas.core.construction import (
+    array as pd_array,
     extract_array,
-    pd_array,
 )
 from pandas.core.indexers import (
     check_array_indexer,
diff --git a/pandas/core/arrays/interval.py b/pandas/core/arrays/interval.py
@@ -76,9 +76,9 @@
 from pandas.core.arrays.categorical import Categorical
 import pandas.core.common as com
 from pandas.core.construction import (
+    array as pd_array,
     ensure_wrapped_if_datetimelike,
     extract_array,
-    pd_array,
 )
 from pandas.core.indexers import check_array_indexer
 from pandas.core.indexes.base import ensure_index
diff --git a/pandas/core/construction.py b/pandas/core/construction.py
@@ -74,7 +74,7 @@
     )
 
 
-def pd_array(
+def array(
     data: Union[Sequence[object], AnyArrayLike],
     dtype: Optional[Dtype] = None,
     copy: bool = True,
@@ -560,7 +560,7 @@ def sanitize_array(
         if is_object_dtype(subarr.dtype) and not is_object_or_str_dtype:
             inferred = lib.infer_dtype(subarr, skipna=False)
             if inferred in {"interval", "period"}:
-                subarr = pd_array(subarr)
+                subarr = array(subarr)
                 subarr = extract_array(subarr, extract_numpy=True)
 
     return subarr
diff --git a/pandas/core/dtypes/concat.py b/pandas/core/dtypes/concat.py
@@ -25,8 +25,8 @@
 from pandas.core.arrays import ExtensionArray
 from pandas.core.arrays.sparse import SparseArray
 from pandas.core.construction import (
+    array as pd_array,
     ensure_wrapped_if_datetimelike,
-    pd_array,
 )
 
 
diff --git a/pandas/core/indexers.py b/pandas/core/indexers.py
@@ -514,7 +514,7 @@ def check_array_indexer(array: AnyArrayLike, indexer: Any) -> Any:
     ...
     IndexError: arrays used as indices must be of integer or boolean type
     """
-    from pandas.core.construction import pd_array
+    from pandas.core.construction import array as pd_array
 
     # whatever is not an array-like is returned as-is (possible valid array
     # indexers that are not array-like: integer, slice, Ellipsis, None)
diff --git a/pandas/core/indexing.py b/pandas/core/indexing.py
@@ -48,7 +48,7 @@
 )
 
 import pandas.core.common as com
-from pandas.core.construction import pd_array
+from pandas.core.construction import array as pd_array
 from pandas.core.indexers import (
     check_array_indexer,
     is_exact_shape_match,
diff --git a/pandas/core/strings/accessor.py b/pandas/core/strings/accessor.py
@@ -3021,8 +3021,10 @@ def _str_extract_noexpand(arr, pat, flags=0):
     Index.
 
     """
-    from pandas import DataFrame
-    from pandas.core.construction import pd_array
+    from pandas import (
+        DataFrame,
+        array as pd_array,
+    )
 
     regex = re.compile(pat, flags=flags)
     groups_or_na = _groups_or_na_fun(regex)
diff --git a/scripts/tests/test_use_pd_array_in_core.py b/scripts/tests/test_use_pd_array_in_core.py
@@ -2,24 +2,25 @@
 
 from scripts.use_pd_array_in_core import use_pd_array
 
-BAD_FILE_0 = "\nfrom pandas import array as pd_array"
-BAD_FILE_1 = "import pandas as pd\npd.array"
-GOOD_FILE = "from pandas.core.construction import pd_array"
+BAD_FILE_0 = "import pandas as pd\npd.array"
+BAD_FILE_1 = "\nfrom pandas import array"
+GOOD_FILE_0 = "from pandas import array as pd_array"
+GOOD_FILE_1 = "from pandas.core.construction import array as pd_array"
 PATH = "t.py"
 
 
 @pytest.mark.parametrize("content", [BAD_FILE_0, BAD_FILE_1])
 def test_inconsistent_usage(content, capsys):
     result_msg = (
-        "t.py:2:0: Don't use pd.array in core, "
-        "instead use 'from pandas.core.construction import pd_array'\n"
+        r"t.py:2:0: Don't use pd.array in core, import array as pd_array instead\n"
     )
     with pytest.raises(SystemExit):
         use_pd_array(content, PATH)
     expected_msg, _ = capsys.readouterr()
     assert result_msg == expected_msg
 
 
-def test_consistent_usage():
+@pytest.mark.parametrize("content", [GOOD_FILE_0, GOOD_FILE_1])
+def test_consistent_usage(content):
     # should not raise
-    use_pd_array(GOOD_FILE, PATH)
+    use_pd_array(content, PATH)
diff --git a/scripts/use_pd_array_in_core.py b/scripts/use_pd_array_in_core.py
@@ -1,8 +1,7 @@
 """
-Check files use pd_array from pandas.core.construction rather than pd.array.
+Check that pandas/core imports pandas.array as pd_array.
 
-This is only run within pandas/core and makes it easier to grep for usage of
-pandas array.
+This makes it easier to grep for usage of pandas array.
 
 This is meant to be run as a pre-commit hook - to run it manually, you can do:
 
@@ -20,8 +19,7 @@
 
 ERROR_MESSAGE = (
     "{path}:{lineno}:{col_offset}: "
-    "Don't use pd.array in core, instead use "
-    "'from pandas.core.construction import pd_array'\n"
+    "Don't use pd.array in core, import array as pd_array instead\n"
 )
 
 
@@ -35,7 +33,7 @@ def visit_ImportFrom(self, node: ast.ImportFrom) -> None:
         if (
             node.module is not None
             and node.module.startswith("pandas")
-            and any(i.name == "array" for i in node.names)
+            and any(i.name == "array" and i.asname != "pd_array" for i in node.names)
         ):
             msg = ERROR_MESSAGE.format(
                 path=self.path, lineno=node.lineno, col_offset=node.col_offset

Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,9 @@`
`84`	`84`
`85`	`85`	`from pandas.core.array_algos.take import take_nd`
`86`	`86`	`from pandas.core.construction import (`
	`87`	`+ array as pd_array,`
`87`	`88`	`ensure_wrapped_if_datetimelike,`
`88`	`89`	`extract_array,`
`89`		`- pd_array,`
`90`	`90`	`)`
`91`	`91`	`from pandas.core.indexers import validate_indices`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`UInt64Dtype,`
`44`	`44`	`)`
`45`	`45`	`from pandas.core.arrays.string_ import StringDtype`
`46`		`-from pandas.core.construction import pd_array as array`
	`46`	`+from pandas.core.construction import array`
`47`	`47`	`from pandas.core.flags import Flags`
`48`	`48`	`from pandas.core.groupby import (`
`49`	`49`	`Grouper,`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,8 @@`
`52`	`52`	`)`
`53`	`53`	`import pandas.core.common as com`
`54`	`54`	`from pandas.core.construction import (`
	`55`	`+ array as pd_array,`
`55`	`56`	`create_series_with_explicit_dtype,`
`56`		`- pd_array,`
`57`	`57`	`)`
`58`	`58`
`59`	`59`	`if TYPE_CHECKING:`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@`
`97`	`97`	`)`
`98`	`98`	`import pandas.core.common as com`
`99`	`99`	`from pandas.core.construction import (`
	`100`	`+ array as pd_array,`
`100`	`101`	`extract_array,`
`101`		`- pd_array,`
`102`	`102`	`sanitize_array,`
`103`	`103`	`)`
`104`	`104`	`from pandas.core.indexers import deprecate_ndim_indexing`
Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,8 @@`
`107`	`107`	`)`
`108`	`108`	`import pandas.core.common as com`
`109`	`109`	`from pandas.core.construction import (`
	`110`	`+ array as pd_array,`
`110`	`111`	`extract_array,`
`111`		`- pd_array,`
`112`	`112`	`)`
`113`	`113`	`from pandas.core.indexers import (`
`114`	`114`	`check_array_indexer,`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@`
`25`	`25`	`from pandas.core.arrays import ExtensionArray`
`26`	`26`	`from pandas.core.arrays.sparse import SparseArray`
`27`	`27`	`from pandas.core.construction import (`
	`28`	`+ array as pd_array,`
`28`	`29`	`ensure_wrapped_if_datetimelike,`
`29`		`- pd_array,`
`30`	`30`	`)`
`31`	`31`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`)`
`49`	`49`
`50`	`50`	`import pandas.core.common as com`
`51`		`-from pandas.core.construction import pd_array`
	`51`	`+from pandas.core.construction import array as pd_array`
`52`	`52`	`from pandas.core.indexers import (`
`53`	`53`	`check_array_indexer,`
`54`	`54`	`is_exact_shape_match,`