From d4b7a608bab0e7c140937b0b59ca45115d205145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20K=C3=B6lling?= <tobias.koelling@mpimet.mpg.de>
Date: Fri, 12 Mar 2021 15:20:19 +0100
Subject: [PATCH] conventions: decode unsigned integers to signed if
 _Unsigned=false (#4966)

---
 doc/whats-new.rst           |  2 ++
 xarray/coding/variables.py  |  8 ++++++++
 xarray/tests/test_coding.py | 28 ++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/doc/whats-new.rst b/doc/whats-new.rst
index ed41daabdf8..563be73ddea 100644
--- a/doc/whats-new.rst
+++ b/doc/whats-new.rst
@@ -69,6 +69,8 @@ Bug fixes
   By `Victor Negîrneac <https://github.com/caenrigen>`_.
 - Don't allow passing ``axis`` to :py:meth:`Dataset.reduce` methods (:issue:`3510`, :pull:`4940`).
   By `Justus Magin <https://github.com/keewis>`_.
+- Decode values as signed if attribute `_Unsigned = "false"` (:issue:`4954`)
+  By `Tobias Kölling <https://github.com/d70-t>`_.
 
 Documentation
 ~~~~~~~~~~~~~
diff --git a/xarray/coding/variables.py b/xarray/coding/variables.py
index b035ff82086..938752c4efc 100644
--- a/xarray/coding/variables.py
+++ b/xarray/coding/variables.py
@@ -316,6 +316,14 @@ def decode(self, variable, name=None):
                     if "_FillValue" in attrs:
                         new_fill = unsigned_dtype.type(attrs["_FillValue"])
                         attrs["_FillValue"] = new_fill
+            elif data.dtype.kind == "u":
+                if unsigned == "false":
+                    signed_dtype = np.dtype("i%s" % data.dtype.itemsize)
+                    transform = partial(np.asarray, dtype=signed_dtype)
+                    data = lazy_elemwise_func(data, transform, signed_dtype)
+                    if "_FillValue" in attrs:
+                        new_fill = signed_dtype.type(attrs["_FillValue"])
+                        attrs["_FillValue"] = new_fill
             else:
                 warnings.warn(
                     "variable %r has _Unsigned attribute but is not "
diff --git a/xarray/tests/test_coding.py b/xarray/tests/test_coding.py
index e0df7782aa7..839f2fd1f2e 100644
--- a/xarray/tests/test_coding.py
+++ b/xarray/tests/test_coding.py
@@ -117,3 +117,31 @@ def test_scaling_offset_as_list(scale_factor, add_offset):
     encoded = coder.encode(original)
     roundtripped = coder.decode(encoded)
     assert_allclose(original, roundtripped)
+
+
+@pytest.mark.parametrize("bits", [1, 2, 4, 8])
+def test_decode_unsigned_from_signed(bits):
+    unsigned_dtype = np.dtype(f"u{bits}")
+    signed_dtype = np.dtype(f"i{bits}")
+    original_values = np.array([np.iinfo(unsigned_dtype).max], dtype=unsigned_dtype)
+    encoded = xr.Variable(
+        ("x",), original_values.astype(signed_dtype), attrs={"_Unsigned": "true"}
+    )
+    coder = variables.UnsignedIntegerCoder()
+    decoded = coder.decode(encoded)
+    assert decoded.dtype == unsigned_dtype
+    assert decoded.values == original_values
+
+
+@pytest.mark.parametrize("bits", [1, 2, 4, 8])
+def test_decode_signed_from_unsigned(bits):
+    unsigned_dtype = np.dtype(f"u{bits}")
+    signed_dtype = np.dtype(f"i{bits}")
+    original_values = np.array([-1], dtype=signed_dtype)
+    encoded = xr.Variable(
+        ("x",), original_values.astype(unsigned_dtype), attrs={"_Unsigned": "false"}
+    )
+    coder = variables.UnsignedIntegerCoder()
+    decoded = coder.decode(encoded)
+    assert decoded.dtype == signed_dtype
+    assert decoded.values == original_values