Merge pull request #220 from mhvk/phase-str-scalar

Also fix __str__ for scalar case
mhvk · Mar 13, 2021 · 09112e1 · 09112e1
2 parents f0f08cc + a67ca1f
commit 09112e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/baseband_tasks/phases/phase.py b/baseband_tasks/phases/phase.py
@@ -316,7 +316,8 @@ def __str__(self):
         # Override Angle, since one cannot override the formatter for
         # structured dtype in array2string.
         def formatter(x):
-            return x.view(self.dtype).to_string()
+            # [...] and view as self.__class__ are needed for scalar case.
+            return x[...].view(self.dtype, self.__class__).to_string()
 
         return np.array2string(self.view(f"V{self.dtype.itemsize}"),
                                formatter={'all': formatter}) + self._unitstr

diff --git a/baseband_tasks/tests/test_phase_class.py b/baseband_tasks/tests/test_phase_class.py
@@ -679,13 +679,15 @@ def test_from_string_invalid(self, item):
         with pytest.raises(ValueError):
             Phase.from_string(item)
 
+    @pytest.mark.parametrize('item', (0, (), (0, 0)))
     @pytest.mark.parametrize('imag', (True, False))
-    def test_str_works(self, imag):
-        str(self.phase * 1j if imag else self.phase)
+    def test_str_works(self, imag, item):
+        str((self.phase * 1j if imag else self.phase)[item])
 
+    @pytest.mark.parametrize('item', (0, (), (0, 0)))
     @pytest.mark.parametrize('imag', (True, False))
-    def test_repr_works(self, imag):
-        repr(self.phase * 1j if imag else self.phase)
+    def test_repr_works(self, imag, item):
+        repr((self.phase * 1j if imag else self.phase)[item])
 
     @pytest.mark.parametrize('imag', (True, False))
     def test_str(self, imag):