[_709] correct and streamline. _opts and __kw should be separate.

Author: d-w-moore

irods/manager/metadata_manager.py

@@ -28,41 +28,37 @@ class InvalidAtomicAVURequest(Exception):
 
 class MetadataManager(Manager):
 
+    def __init__(self, *_):
+        self._opts = {'admin':False, 'timestamps':False}
+        super().__init__(*_)
+
     @property
     def use_timestamps(self):
-        return getattr(self, "_use_ts", False)
+        return self._opts['timestamps']
 
     __kw = {}  # default (empty) keywords
-    _admin = False
-    _use_ts = False
 
     def _updated_keywords(self, opts):
         kw_ = self.__kw.copy()
         kw_.update(opts)
         return kw_
 
-    __generate_new_options = staticmethod(lambda obj, from_kw: { 'admin':obj._admin,
-                                                                 'timestamps':obj._use_ts,
-                                                                 **from_kw })
-
     def get_api_keywords(self): return self.__kw.copy()
 
-    def __call__(self, **kw_opt):
+    def __call__(self, **flags):
         # Make a new shallow copy of the manager object, but update options from parameter list.
         new_self = copy.copy(self)
-        new_options = new_self.__kw = self.__generate_new_options(new_self, kw_opt)
 
         # Update the flags that do bookkeeping in the returned(new) manager object.
-        if (timestamps:=new_options.pop('timestamps',None)) is not None:
-            new_self._use_ts = timestamps
-        if (admin:=new_options.pop('admin',None)) is not None:
-            new_self._admin = admin
+        new_self._opts.update(
+            (key,val) for key,val in flags.items() if val is not None
+        )
 
         # Update the ADMIN_KW flag in the returned(new) object.
-        if new_self._admin:
-            new_options[kw.ADMIN_KW] = ""
+        if new_self._opts.get('admin'):
+            self.__kw[kw.ADMIN_KW] = ""
         else:
-            new_options.pop(kw.ADMIN_KW, None)
+            self.__kw.pop(kw.ADMIN_KW, None)
 
         return new_self
 

irods/test/meta_test.py

@@ -798,22 +798,23 @@ def test_xml_mode_addresses_odd_metadata_characters__issue_582(self):
 
     def test_cascading_changes_of_metadata_manager_options__issue_709(self):
         d = None
+        get_option = lambda metacoll, key: metacoll._manager._opts[key]
         try:
             d = self.sess.data_objects.create(f'{self.coll.path}/issue_709_test_1')
             m = d.metadata
-            self.assertEqual(m._manager._admin,False)
+            self.assertEqual(get_option(m,'admin'),False)
 
             m2 = m(admin = True)
-            self.assertEqual(m2._manager._use_ts,False)
-            self.assertEqual(m2._manager._admin,True)
+            self.assertEqual(get_option(m2,'timestamps'),False)
+            self.assertEqual(get_option(m2,'admin'),True)
 
             m3 = m2(timestamps = True)
-            self.assertEqual(m3._manager._use_ts, True)
-            self.assertEqual(m3._manager._admin, True)
+            self.assertEqual(get_option(m3,'timestamps'), True)
+            self.assertEqual(get_option(m3,'admin'), True)
             self.assertEqual(m3._manager.get_api_keywords().get(kw.ADMIN_KW), "")
 
             m4 = m3(admin = False)
-            self.assertEqual(m4._manager._use_ts, True)
+            self.assertEqual(get_option(m4,'admin'), False)
             self.assertEqual(m4._manager.get_api_keywords().get(kw.ADMIN_KW), None)
         finally:
             if d: