Fix typedesc_from_python_array_code parity

Signed-off-by: Aleksandr Motsjonov <soswow@gmail.com>

Author: soswow

src/python-nanobind/MIGRATION_STATUS.md

@@ -7,15 +7,15 @@ Generated from the binding sources. The nanobind extension is `PyOpenImageIONano
 | Source file | Python / C++ API |
 | --- | --- |
 | `py_roi.cpp` | <code>ROI</code><br>Free functions:<br><ul><li><code>union</code></li><li><code>intersection</code></li><li><code>get_roi</code></li><li><code>get_roi_full</code></li><li><code>set_roi</code></li><li><code>set_roi_full</code></li></ul> |
+| `py_typedesc.cpp` | <code>TypeDesc</code><br>Enums: <code>BASETYPE</code>, <code>AGGREGATE</code>, <code>VECSEMANTICS</code><br>Module <code>Type*</code> constants |
+| `py_imagespec.cpp` | <code>ImageSpec</code> (bound methods/properties, typed <code>attribute</code> / buffer paths via shared helpers). |
 
 ## Migrated — partial (gaps or intentional deltas vs pybind)
 
 | Source file | Migrated (vs pybind) | Missing or divergent (vs pybind) |
 | --- | --- | --- |
 | `py_oiio.cpp` (`_OpenImageIO` module) | <ul><li><code>attribute</code> (one-arg and typed)</li><li><code>get_int_attribute</code></li><li><code>get_float_attribute</code></li><li><code>get_string_attribute</code></li><li><code>getattribute</code></li><li><code>__version__</code></li></ul> | <ul><li><code>geterror</code></li><li><code>get_bytes_attribute</code></li><li>Module <code>set_colorspace</code> (helper taking <code>ImageSpec</code> — the instance method is on <code>ImageSpec</code> in nanobind)</li><li><code>set_colorspace_rec709_gamma</code></li><li><code>equivalent_colorspace</code></li><li><code>is_imageio_format_name</code></li><li><code>AutoStride</code></li><li><code>openimageio_version</code>, <code>VERSION</code>, <code>VERSION_STRING</code>, <code>VERSION_MAJOR</code>, <code>VERSION_MINOR</code>, <code>VERSION_PATCH</code>, <code>INTRO_STRING</code></li><li>Optional: stack traces when <code>OPENIMAGEIO_DEBUG_PYTHON</code> is set (<code>Sysutil</code>)</li><li><code>make_pyobject</code>: no pybind-style <code>debugfmt</code> when the type is unhandled (returns default quietly)</li></ul> |
-| `py_typedesc.cpp` | <code>TypeDesc</code><br>Enums: <code>BASETYPE</code>, <code>AGGREGATE</code>, <code>VECSEMANTICS</code><br>Module <code>Type*</code> constants | Helper <code>typedesc_from_python_array_code</code> (used for buffer/array attribute values): pybind maps <code>l</code>→INT64, <code>L</code>→UINT64; nanobind maps <code>l</code>/<code>i</code>→INT, <code>L</code>/<code>I</code>→UINT. Does not affect <code>TypeDesc("...")</code> string construction. |
-| `py_paramvalue.cpp` | Types: <code>ParamValue</code>, <code>ParamValueList</code><br>Enum: <code>Interp</code><br>Rest of the bound surface matches pybind. | <code>paramvalue_from_pyobject</code>: no pybind-style path for <code>UINT8</code> + <code>bytes</code> with <code>type.arraylen</code> (incl. inferred length from <code>bytes</code> size). Typed attribute paths that rely on <code>typedesc_from_python_array_code</code> share the same buffer-format caveat as <code>py_typedesc.cpp</code>. |
-| `py_imagespec.cpp` | <code>ImageSpec</code> (bound methods/properties as implemented). | Typed <code>attribute</code> / buffer paths use shared helpers; same <code>typedesc_from_python_array_code</code> behavior as <code>py_typedesc.cpp</code>. |
+| `py_paramvalue.cpp` | Types: <code>ParamValue</code>, <code>ParamValueList</code><br>Enum: <code>Interp</code><br>Rest of the bound surface matches pybind. | <code>paramvalue_from_pyobject</code>: no pybind-style path for <code>UINT8</code> + <code>bytes</code> with <code>type.arraylen</code> (incl. inferred length from <code>bytes</code> size). |
 | `__init__.py` (package) | Env / DLL path setup, <code>from ._OpenImageIO import *</code>, version docstring. | <strong>TODO:</strong> Python CLI entry-point trampolines when the install layout matches the full wheel. |
 
 ---

src/python-nanobind/py_oiio.cpp

@@ -59,10 +59,14 @@ typedesc_from_python_array_code(string_view code)
         return TypeDesc::INT16;
     if (code == "H")
         return TypeDesc::UINT16;
-    if (code == "i" || code == "l")
+    if (code == "i")
         return TypeDesc::INT;
-    if (code == "I" || code == "L")
+    if (code == "I")
         return TypeDesc::UINT;
+    if (code == "l")
+        return TypeDesc::INT64;
+    if (code == "L")
+        return TypeDesc::UINT64;
     if (code == "q")
         return TypeDesc::INT64;
     if (code == "Q")

testsuite/python-typedesc/ref/out.txt

@@ -247,4 +247,6 @@ type 'TypeURational'
 type 'TypeUInt'
     c_str "uint"
 
+Passed: array('l')+int[2] does not mis-read int64 as two 32-bit ints (matches pybind)
+
 Done.

testsuite/python-typedesc/src/test_typedesc.py

@@ -6,6 +6,7 @@
 
 from __future__ import annotations
 
+import array
 import OpenImageIO as oiio
 
 
@@ -214,6 +215,29 @@ def breakdown_test(t, name="", verbose=True):
     breakdown_test (oiio.TypeUInt,      "TypeUInt",      verbose=False)
     print ("")
 
+    # 8-byte array('l'): PEP 3118 'l' must not be treated as 32-bit int when
+    # copying into int[2], or the first 8 bytes are split into (low32, high32)
+    # and the attribute can read as (1, 0) for values [1, 2] (see
+    # typedesc_from_python_array_code in py_oiio.cpp). Where C long is
+    # 4 bytes, the check below is skipped; the final message is unchanged so
+    # reference output is stable across platforms.
+    _passed_msg = (
+        "Passed: array('l')+int[2] does not mis-read int64 as two 32-bit ints (matches pybind)"
+    )
+    if array.array("l", [0]).itemsize == 8:
+        b = array.array("l", [1, 2])
+        spec = oiio.ImageSpec()
+        spec.attribute("regression_k", oiio.TypeDesc("int[2]"), memoryview(b))
+        v = spec.get("regression_k", None)
+        if v is not None and tuple(v) == (1, 0):
+            print(
+                "Failed: array('l')+int[2] mis-stored (1,0) — 'l' must not be INT32-typed in buffer code"
+            )
+        else:
+            print(_passed_msg)
+    else:
+        print(_passed_msg)
+
     print ("Done.")
 except Exception as detail:
     print ("Unknown exception:", detail)