ConfigDict: defining __delattr__()

This partially fixed #352
jsiirola · Apr 8, 2021 · f3a7fe2 · f3a7fe2
1 parent e99ecde
commit f3a7fe2
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 0 deletions.
diff --git a/pyomo/common/config.py b/pyomo/common/config.py
@@ -1829,6 +1829,17 @@ def __setattr__(self, name, value):
         else:
             ConfigDict.__setitem__(self, name, value)
 
+    def __delattr__(self, name):
+        _key = str(name).replace(' ','_')
+        if _key in self._data:
+            del self[_key]
+        elif _key in dir(self):
+            raise AttributeError("'%s' object attribute '%s' is read-only" %
+                                 (type(self).__name__, name))
+        else:
+            raise AttributeError("'%s' object has no attribute '%s'" %
+                                 (type(self).__name__, name))
+
     def keys(self):
         return iter(self)
 

diff --git a/pyomo/common/tests/test_config.py b/pyomo/common/tests/test_config.py
@@ -1334,11 +1334,41 @@ def test_delitem(self):
         self.assertEqual(sorted(config.keys()), ['bar'])
         config.foo = 5
         self.assertEqual(sorted(config.keys()), ['bar', 'foo'])
+        self.assertEqual(sorted(config._declared), ['bar'])
         del config['foo']
         self.assertEqual(sorted(config.keys()), ['bar'])
+        self.assertEqual(sorted(config._declared), ['bar'])
         del config['bar']
         self.assertEqual(sorted(config.keys()), [])
+        self.assertEqual(sorted(config._declared), [])
 
+        with self.assertRaisesRegex(KeyError, "'get'"):
+            del config['get']
+        with self.assertRaisesRegex(KeyError, "'foo'"):
+            del config['foo']
+
+    def test_delattr(self):
+        config = ConfigDict(implicit=True)
+        config.declare('bar', ConfigValue())
+        self.assertEqual(sorted(config.keys()), ['bar'])
+        config.foo = 5
+        self.assertEqual(sorted(config.keys()), ['bar', 'foo'])
+        self.assertEqual(sorted(config._declared), ['bar'])
+        del config.foo
+        self.assertEqual(sorted(config._declared), ['bar'])
+        self.assertEqual(sorted(config.keys()), ['bar'])
+        del config.bar
+        self.assertEqual(sorted(config.keys()), [])
+        self.assertEqual(sorted(config._declared), [])
+
+        with self.assertRaisesRegex(
+                AttributeError,
+                "'ConfigDict' object attribute 'get' is read-only"):
+            del config.get
+        with self.assertRaisesRegex(
+                AttributeError,
+                "'ConfigDict' object has no attribute 'foo'"):
+            del config.foo
 
     def test_generate_custom_documentation(self):
         reference = \