flip skip

TomAugspurger · Nov 26, 2023 · ec103c7 · ec103c7
1 parent 591dfb6
commit ec103c7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/pandas/core/arrays/arrow/accessors.py b/pandas/core/arrays/arrow/accessors.py
@@ -387,11 +387,11 @@ def get_name(
             data: pa.ChunkedArray,
         ):
             if isinstance(level_name_or_index, int):
-                index = data.type.field(level_name_or_index).name
+                name = data.type.field(level_name_or_index).name
             elif isinstance(level_name_or_index, (str, bytes)):
-                index = level_name_or_index
+                name = level_name_or_index
             elif isinstance(level_name_or_index, pc.Expression):
-                index = str(level_name_or_index)
+                name = str(level_name_or_index)
             elif is_list_like(level_name_or_index):
                 # For nested input like [2, 1, 2]
                 # iteratively get the struct and field name. The last
@@ -402,18 +402,17 @@ def get_name(
                     name_or_index = level_name_or_index.pop()
                     name = get_name(name_or_index, selected)
                     selected = selected.type.field(selected.type.get_field_index(name))
-                    index = selected.name
-                return index
+                    name = selected.name
             else:
                 raise ValueError(
                     "name_or_index must be an int, str, bytes, "
                     "pyarrow.compute.Expression, or list of those"
                 )
-            return index
+            return name
 
         pa_arr = self._data.array._pa_array
-        name = get_name(name_or_index, pa_arr)
         field_arr = pc.struct_field(pa_arr, name_or_index)
+        name = get_name(name_or_index, pa_arr)
 
         return Series(
             field_arr,

diff --git a/pandas/tests/series/accessors/test_struct_accessor.py b/pandas/tests/series/accessors/test_struct_accessor.py
@@ -164,7 +164,7 @@ def test_struct_accessor_api_for_invalid(invalid):
         ([b"string_col"], "string_col"),
     ],
 )
-@pytest.mark.skipif(not pa_version_under11p0, reason="pyarrow>=11.0.0 required")
+@pytest.mark.skipif(pa_version_under11p0, reason="pyarrow>=11.0.0 required")
 def test_struct_accessor_field_expanded(indices, name):
     arrow_type = pa.struct(
         [