Merge pull request #884 from patiences/add-setitem

Fix error messages for calling __setitem__ on an immutable type
beeware · Aug 2, 2018 · d26e35d · d26e35d
2 parents f1243c6 + 1dbc585
commit d26e35d
Show file tree

Hide file tree

Showing 12 changed files with 114 additions and 0 deletions.
diff --git a/python/common/org/python/types/Bool.java b/python/common/org/python/types/Bool.java
@@ -94,6 +94,16 @@ public org.python.types.Str __getitem__(org.python.Object format_string) {
         throw new org.python.exceptions.TypeError("'bool' object is not subscriptable");
     }
 
+    @org.python.Method(
+            __doc__ = "",
+            args = {"index", "value"}
+    )
+    public void __setitem__(org.python.Object index, org.python.Object value) {
+        throw new org.python.exceptions.TypeError(
+                "'bool' object does not support item assignment"
+        );
+    }
+
     @org.python.Method(
             __doc__ = "Return self<value.",
             args = {"other"}

diff --git a/python/common/org/python/types/FrozenSet.java b/python/common/org/python/types/FrozenSet.java
@@ -165,6 +165,16 @@ public org.python.Object copy() {
         return this;
     }
 
+    @org.python.Method(
+            __doc__ = "",
+            args = {"index", "value"}
+    )
+    public void __setitem__(org.python.Object index, org.python.Object value) {
+        throw new org.python.exceptions.TypeError(
+                "'frozenset' object does not support item assignment"
+        );
+    }
+
     @org.python.Method(
             __doc__ = "Return self<value.",
             args = {"other"}

diff --git a/python/common/org/python/types/Int.java b/python/common/org/python/types/Int.java
@@ -155,6 +155,16 @@ public org.python.types.Str __getitem__(org.python.Object format_str) {
         throw new org.python.exceptions.TypeError("'int' object is not subscriptable");
     }
 
+    @org.python.Method(
+            __doc__ = "",
+            args = {"index", "value"}
+    )
+    public void __setitem__(org.python.Object index, org.python.Object value) {
+        throw new org.python.exceptions.TypeError(
+                "'int' object does not support item assignment"
+        );
+    }
+
     @org.python.Method(
             __doc__ = "Return self<value.",
             args = {"other"}

diff --git a/python/common/org/python/types/Range.java b/python/common/org/python/types/Range.java
@@ -122,6 +122,16 @@ public org.python.Object __getitem__(org.python.Object index) {
         }
     }
 
+    @org.python.Method(
+            __doc__ = "",
+            args = {"index", "value"}
+    )
+    public void __setitem__(org.python.Object index, org.python.Object value) {
+        throw new org.python.exceptions.TypeError(
+                "'range' object does not support item assignment"
+        );
+    }
+
     @org.python.Method(
             __doc__ = "Implement __len__(self)."
     )

diff --git a/python/common/org/python/types/Str.java b/python/common/org/python/types/Str.java
@@ -376,6 +376,16 @@ public org.python.Object __getitem__(org.python.Object index) {
         }
     }
 
+    @org.python.Method(
+            __doc__ = "",
+            args = {"index", "value"}
+    )
+    public void __setitem__(org.python.Object index, org.python.Object value) {
+        throw new org.python.exceptions.TypeError(
+                "'str' object does not support item assignment"
+        );
+    }
+
     @org.python.Method(
             __doc__ = "Implement iter(self)."
     )

diff --git a/tests/datatypes/test_bool.py b/tests/datatypes/test_bool.py
@@ -21,6 +21,15 @@ def test_getattr(self):
                 print(err)
             """)
 
+    def test_setitem(self):
+        self.assertCodeExecution("""
+            x = True
+            try:
+                x[0] = 1
+            except TypeError as err:
+                print(err)
+        """)
+
 
 class UnaryBoolOperationTests(UnaryOperationTestCase, TranspileTestCase):
     data_type = 'bool'

diff --git a/tests/datatypes/test_float.py b/tests/datatypes/test_float.py
@@ -26,6 +26,15 @@ def test_getattr(self):
                 print(err)
             """)
 
+    def test_setitem(self):
+        self.assertCodeExecution("""
+            x = 3.14159
+            try:
+                x[0] = 2
+            except TypeError as err:
+                print(err)
+        """)
+
     def test_repr(self):
         self.assertCodeExecution("""
             x = 350000000000000000.0

diff --git a/tests/datatypes/test_frozenset.py b/tests/datatypes/test_frozenset.py
@@ -145,6 +145,15 @@ def test_copy(self):
 
             """)
 
+    def test_setitem(self):
+        self.assertCodeExecution("""
+            x = frozenset("hello world")
+            try:
+                x[0] = "goodbye"
+            except TypeError as err:
+                print(err)
+        """)
+
     def test_isdisjoint(self):
         self.assertCodeExecution("""
             x = frozenset("hello world")

diff --git a/tests/datatypes/test_int.py b/tests/datatypes/test_int.py
@@ -28,6 +28,15 @@ def test_getattr(self):
                 print(err)
             """)
 
+    def test_setitem(self):
+        self.assertCodeExecution("""
+            x = 37
+            try:
+                x[0] = 1
+            except TypeError as err:
+                print(err)
+        """)
+
     def test_invalid_literal(self):
         self.assertCodeExecution("""
             try:

diff --git a/tests/datatypes/test_range.py b/tests/datatypes/test_range.py
@@ -80,6 +80,15 @@ def test_iterator_iterator(self):
             print(r)
         """)
 
+    def test_setitem(self):
+        self.assertCodeExecution("""
+            r = range(10)
+            try:
+                r[0] = "abc"
+            except TypeError as e:
+                print(e)
+        """)
+
 
 class UnaryRangeOperationTests(UnaryOperationTestCase, TranspileTestCase):
     data_type = 'range'

diff --git a/tests/datatypes/test_str.py b/tests/datatypes/test_str.py
@@ -238,6 +238,16 @@ def test_getitem(self):
                 print(err)
             """)
 
+    def test_setitem(self):
+        # Strings are immutable and do not allow item assignment
+        self.assertCodeExecution("""
+            x = "BeeWare"
+            try:
+                x[0] = "A"
+            except TypeError as err:
+                print(err)
+        """)
+
     def test_slice(self):
         # Full slice
         self.assertCodeExecution("""

diff --git a/tests/datatypes/test_tuple.py b/tests/datatypes/test_tuple.py
@@ -43,6 +43,15 @@ def test_const_creation_multitype(self):
             print(x)
             """)
 
+    def test_setitem(self):
+        self.assertCodeExecution("""
+            x = (1, 2, 3, 4, 5)
+            try:
+                x[0] = "a"
+            except TypeError as err:
+                print(err)
+        """)
+
     def test_getitem(self):
         # Simple positive index
         self.assertCodeExecution("""