fix deserialization error

Author: irmen

Pyro5/serializers.py

@@ -190,11 +190,10 @@ def dict_to_class(cls, data):
         if "__" in classname:
             raise errors.SecurityError("refused to deserialize types with double underscores in their name: " + classname)
         # for performance, the constructors below are hardcoded here instead of added on a per-class basis to the dict-to-class registry
-        if classname.startswith("Pyro5.core."):
-            if classname == "Pyro5.core.URI":
-                uri = core.URI.__new__(core.URI)
-                uri.__setstate_from_dict__(data["state"])
-                return uri
+        if classname == "Pyro5.core.URI":
+            uri = core.URI.__new__(core.URI)
+            uri.__setstate_from_dict__(data["state"])
+            return uri
         elif classname == "Pyro5.client.Proxy":
             proxy = client.Proxy.__new__(client.Proxy)
             proxy.__setstate_from_dict__(data["state"])

examples/autoproxy/client.py

@@ -13,7 +13,7 @@
 print(repr(thing1))
 
 # interact with them on the server.
-print("Speaking stuff.")
+print("Speaking stuff (see output on server).")
 thing1.speak("I am the first")
 thing2.speak("I am second")
 thing3.speak("I am last then...")

examples/batchedcalls/client.py

@@ -80,6 +80,5 @@
         # this will raise the proper zerodivision exception once we're about
         # to process the batch result from the divide by 0 call.
 except ZeroDivisionError:
-    # @todo FIX THIS a serialization error is thrown rather than the divide by zero error we expect... unsupported serialized class: Pyro5.core._ExceptionWrapper
     print("A divide by zero error occurred during the batch! (expected)")
     print("".join(get_pyro_traceback()))

performance4.py

@@ -1,20 +1,19 @@
 import timeit
-import uuid
-import Pyro4
-import Pyro4.core
+import Pyro4.naming
 
 
-# Pyro4.core.current_context.correlation_id = uuid.uuid1()
+Pyro4.config.SERIALIZER = 'marshal'
+
 
 num_iterations = 3000
 num_tries = 10
 
-ns = Pyro4.locateNS()
+ns = Pyro4.naming.locateNS()
 ns._pyroBind()
 
 
 def test():
-    ns.list("Pyro.NameServer", return_metadata=True)
+    ns.list("Pyro.NameServer", return_metadata=False)
 
 
 print("running %d tries..." % num_tries)

performance5.py

@@ -1,10 +1,10 @@
 import timeit
-import uuid
 import Pyro5.api
-import Pyro5.core
+import Pyro5.config
 
 
-# Pyro5.core.current_context.correlation_id = uuid.uuid1()
+Pyro5.config.SERIALIZER = 'marshal'
+
 
 num_iterations = 3000
 num_tries = 10
@@ -14,7 +14,7 @@
 
 
 def test():
-    ns.list("Pyro.NameServer", return_metadata=True)
+    ns.list("Pyro.NameServer", return_metadata=False)
 
 
 print("running %d tries..." % num_tries)