Improve registration robustness for instances of registered classes

Author: irmen

Pyro5/server.py

@@ -660,7 +660,9 @@ def register(self, obj_or_class, objectId=None, force=False, weak=False):
                 obj_or_class._pyroInstancing = ("session", None)
         if not force:
             if hasattr(obj_or_class, "_pyroId") and obj_or_class._pyroId != "":  # check for empty string is needed for Cython
-                raise errors.DaemonError("object or class already has a Pyro id")
+                pyro_id = obj_or_class._pyroId
+                if pyro_id and self.objectsById.get(pyro_id) is obj_or_class:
+                    raise errors.DaemonError("object or class already has a Pyro id")
             if objectId in self.objectsById:
                 raise errors.DaemonError("an object or class is already registered with that id")
         # set some pyro attributes
@@ -674,7 +676,7 @@ def register(self, obj_or_class, objectId=None, force=False, weak=False):
             else:
                 ser.register_type_replacement(type(obj_or_class), _pyro_obj_to_auto_proxy)
         # register the object/class in the mapping
-        self.objectsById[obj_or_class._pyroId] = (obj_or_class if not weak else weakref.ref(obj_or_class))
+        self.objectsById[obj_or_class._pyroId] = obj_or_class if not weak else weakref.ref(obj_or_class)
         if weak: weakref.finalize(obj_or_class,self.unregister,objectId)
         return self.uriFor(objectId)
 

tests/test_daemon.py

@@ -182,12 +182,24 @@ def testRegisterTwice(self):
             assert not(hasattr(o1, "_pyroId"))
             assert not(hasattr(o1, "_pyroDaemon"))
             o1._pyroId = "FOOBAR"
-            with pytest.raises(DaemonError) as x:
-                d.register(o1)
-            assert str(x.value) == "object or class already has a Pyro id"
+            d.register(o1)
             o1._pyroId = ""
             d.register(o1)  # with empty-string _pyroId register should work
 
+    def testRegisterInstanceAndClass(self):
+        with Pyro5.server.Daemon(port=0) as d:
+            o1 = MyObj("object1")
+            o2 = MyObj("object2")
+            d.register(MyObj)
+            d.register(o1)
+            d.register(o2)
+            with pytest.raises(DaemonError) as x:
+                d.register(o2)
+            assert str(x.value) == "object or class already has a Pyro id"
+            with pytest.raises(DaemonError) as x:
+                d.register(MyObj)
+            assert str(x.value) == "object or class already has a Pyro id"
+
     def testRegisterTwiceForced(self):
         with Pyro5.server.Daemon(port=0) as d:
             o1 = MyObj("object1")