post merge fix-up

Author: simonjayhawkins

doc/source/whatsnew/v1.3.0.rst

@@ -184,9 +184,9 @@ pandas options or specify the dtype using ``dtype='string[pyarrow]'``
 
 The ``'string[pyarrow]'`` extension type solves several issues with NumPy backed arrays:
 
-1. 
-2. 
-3. 
+1.
+2.
+3.
 
 
 .. ipython:: python

pandas/conftest.py

@@ -1157,8 +1157,9 @@ def object_dtype(request):
     params=[
         "object",
         "string",
+        "string[python]",
         pytest.param(
-            "arrow_string", marks=td.skip_if_no("pyarrow", min_version="1.0.0")
+            "string[pyarrow]", marks=td.skip_if_no("pyarrow", min_version="1.0.0")
         ),
     ]
 )
@@ -1167,10 +1168,9 @@ def any_string_dtype(request):
     Parametrized fixture for string dtypes.
     * 'object'
     * 'string'
-    * 'arrow_string'
+    * 'string[python]'
+    * 'string[pyarrow]'
     """
-    from pandas.core.arrays.string_arrow import ArrowStringDtype  # noqa: F401
-
     return request.param
 
 

pandas/tests/extension/base/casting.py

@@ -49,15 +49,14 @@ def test_astype_str(self, data):
         "nullable_string_dtype",
         [
             "string",
+            "string[python]",
             pytest.param(
-                "arrow_string", marks=td.skip_if_no("pyarrow", min_version="1.0.0")
+                "string[pyarrow]", marks=td.skip_if_no("pyarrow", min_version="1.0.0")
             ),
         ],
     )
     def test_astype_string(self, data, nullable_string_dtype):
         # GH-33465
-        from pandas.core.arrays.string_arrow import ArrowStringDtype  # noqa: F401
-
         result = pd.Series(data[:5]).astype(nullable_string_dtype)
         expected = pd.Series([str(x) for x in data[:5]], dtype=nullable_string_dtype)
         self.assert_series_equal(result, expected)