fix: more removals

scikit-hep · Nov 8, 2023 · e7cccc9 · e7cccc9
1 parent 5f1df9c
commit e7cccc9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/src/awkward/_connect/numba/arrayview.py b/src/awkward/_connect/numba/arrayview.py
@@ -628,11 +628,11 @@ def __init__(self, arrayview, at):
         self.at = at
 
     def torecord(self):
-        arraylayout = self.arrayview.toarray().layout
+        array = self.arrayview.toarray()
         return wrap_layout(
-            ak.record.Record(arraylayout, self.at),
+            ak.record.Record(array.layout, self.at),
             behavior=self.arrayview.behavior,
-            attrs=self.arrayview.attrs,
+            attrs=array.attrs,
         )
 
 

diff --git a/src/awkward/_connect/numba/layout.py b/src/awkward/_connect/numba/layout.py
@@ -309,7 +309,6 @@ def lower_getitem_range(
         proxyout.stop = builder.add(viewproxy.start, builder.load(regular_stop))
         proxyout.arrayptrs = viewproxy.arrayptrs
         proxyout.pylookup = viewproxy.pylookup
-        proxyout.pyattrs = viewproxy.pyattrs
         return proxyout._getvalue()
 
     def lower_getitem_field(self, context, builder, viewtype, viewval, key):
@@ -522,7 +521,6 @@ def lower_getitem_at(
         proxyout.stop = stop
         proxyout.arrayptrs = viewproxy.arrayptrs
         proxyout.pylookup = viewproxy.pylookup
-        proxyout.pyattrs = viewproxy.pyattrs
         return proxyout._getvalue()
 
     @property
@@ -614,7 +612,6 @@ def lower_getitem_at(
         )
         proxyout.arrayptrs = viewproxy.arrayptrs
         proxyout.pylookup = viewproxy.pylookup
-        proxyout.pyattrs = viewproxy.pyattrs
         return proxyout._getvalue()
 
     @property
@@ -697,7 +694,6 @@ def lower_getitem_at(
         )
         proxynext.arrayptrs = viewproxy.arrayptrs
         proxynext.pylookup = viewproxy.pylookup
-        proxynext.pyattrs = viewproxy.pyattrs
 
         return self.contenttype.lower_getitem_at_check(
             context,
@@ -804,7 +800,6 @@ def lower_getitem_at(
                 )
                 proxynext.arrayptrs = viewproxy.arrayptrs
                 proxynext.pylookup = viewproxy.pylookup
-                proxynext.pyattrs = viewproxy.pyattrs
 
                 outdata = self.contenttype.lower_getitem_at_check(
                     context,
@@ -913,7 +908,6 @@ def lower_getitem_at(
                 proxynext.stop = viewproxy.stop
                 proxynext.arrayptrs = viewproxy.arrayptrs
                 proxynext.pylookup = viewproxy.pylookup
-                proxynext.pyattrs = viewproxy.pyattrs
 
                 outdata = self.contenttype.lower_getitem_at_check(
                     context,
@@ -1047,7 +1041,6 @@ def lower_getitem_at(
                 proxynext.stop = viewproxy.stop
                 proxynext.arrayptrs = viewproxy.arrayptrs
                 proxynext.pylookup = viewproxy.pylookup
-                proxynext.pyattrs = viewproxy.pyattrs
 
                 outdata = self.contenttype.lower_getitem_at_check(
                     context,
@@ -1141,7 +1134,6 @@ def lower_getitem_at(
         proxynext.stop = viewproxy.stop
         proxynext.arrayptrs = viewproxy.arrayptrs
         proxynext.pylookup = viewproxy.pylookup
-        proxynext.pyattrs = viewproxy.pyattrs
 
         outdata = self.contenttype.lower_getitem_at_check(
             context,
@@ -1369,7 +1361,6 @@ def lower_getitem_at(
             )
             proxynext.arrayptrs = viewproxy.arrayptrs
             proxynext.pylookup = viewproxy.pylookup
-            proxynext.pyattrs = viewproxy.pyattrs
 
             return contenttype.lower_getitem_at_check(
                 context,
@@ -1399,7 +1390,6 @@ def lower_getitem_field(self, context, builder, viewtype, viewval, key):
         proxynext.stop = viewproxy.stop
         proxynext.arrayptrs = viewproxy.arrayptrs
         proxynext.pylookup = viewproxy.pylookup
-        proxynext.pyattrs = viewproxy.pyattrs
 
         return proxynext._getvalue()
 
@@ -1428,7 +1418,6 @@ def lower_getitem_field_record(
         )
         proxynext.arrayptrs = arrayviewproxy.arrayptrs
         proxynext.pylookup = arrayviewproxy.pylookup
-        proxynext.pyattrs = arrayviewproxy.pyattrs
 
         nextviewtype = ak._connect.numba.arrayview.wrap(
             contenttype, arrayviewtype, None

diff --git a/tests/test_1240_v2_implementation_of_numba_1.py b/tests/test_1240_v2_implementation_of_numba_1.py
@@ -23,7 +23,7 @@
 def roundtrip(layout):
     assert isinstance(layout, ak.contents.Content)
 
-    lookup = NumbaLookup(layout)
+    lookup = NumbaLookup(layout, None)
     assert isinstance(lookup, ak._lookup.Lookup)
 
     numbatype = ak_numba_arrayview.to_numbatype(layout.form)