Don't invoke json_cirq_type if cirq_type is defined...for now. (quantumlib#4711)

Fixes a backwards-incompatibility in quantumlib#4704.

This alternate return path is necessary until the deprecation cycle for this change is complete.

Author: 95-martin-orion

cirq-core/cirq/protocols/json_serialization.py

@@ -286,6 +286,7 @@ def _json_dict_with_cirq_type(obj: Any):
             "an error starting in Cirq v0.15.",
             DeprecationWarning,
         )
+        return base_dict
     return {'cirq_type': json_cirq_type(type(obj)), **base_dict}
 
 

cirq-core/cirq/protocols/json_serialization_test.py

@@ -21,7 +21,7 @@
 import pathlib
 import sys
 import warnings
-from typing import Dict, List, Optional, Tuple, Type
+from typing import ClassVar, Dict, List, Optional, Tuple, Type
 from unittest import mock
 
 import numpy as np
@@ -77,18 +77,24 @@ def _get_testspecs_for_modules() -> List[ModuleJsonTestSpec]:
 
 def test_deprecated_cirq_type_in_json_dict():
     class HasOldJsonDict:
+        # Required for testing serialization of non-cirq objects.
+        __module__ = 'test.noncirq.namespace'  # type: ignore
+
         def __eq__(self, other):
             return isinstance(other, HasOldJsonDict)
 
         def _json_dict_(self):
-            return {'cirq_type': 'cirq.testing.HasOldJsonDict'}
+            return {'cirq_type': 'test.noncirq.namespace.HasOldJsonDict'}
 
         @classmethod
         def _from_json_dict_(cls, **kwargs):
             return cls()
 
+    with pytest.raises(ValueError, match='not a Cirq type'):
+        _ = cirq.json_cirq_type(HasOldJsonDict)
+
     def custom_resolver(name):
-        if name == 'cirq.testing.HasOldJsonDict':
+        if name == 'test.noncirq.namespace.HasOldJsonDict':
             return HasOldJsonDict
 
     test_resolvers = [custom_resolver] + cirq.DEFAULT_RESOLVERS
@@ -98,21 +104,29 @@ def custom_resolver(name):
 
 def test_deprecated_obj_to_dict_helper_namespace():
     class HasOldJsonDict:
+        # Required for testing serialization of non-cirq objects.
+        __module__ = 'test.noncirq.namespace'  # type: ignore
+
         def __init__(self, x):
             self.x = x
 
         def __eq__(self, other):
             return isinstance(other, HasOldJsonDict) and other.x == self.x
 
         def _json_dict_(self):
-            return json_serialization.obj_to_dict_helper(self, ['x'], namespace='cirq.testing')
+            return json_serialization.obj_to_dict_helper(
+                self, ['x'], namespace='test.noncirq.namespace'
+            )
 
         @classmethod
         def _from_json_dict_(cls, x, **kwargs):
             return cls(x)
 
+    with pytest.raises(ValueError, match='not a Cirq type'):
+        _ = cirq.json_cirq_type(HasOldJsonDict)
+
     def custom_resolver(name):
-        if name == 'cirq.testing.HasOldJsonDict':
+        if name == 'test.noncirq.namespace.HasOldJsonDict':
             return HasOldJsonDict
 
     test_resolvers = [custom_resolver] + cirq.DEFAULT_RESOLVERS
@@ -125,17 +139,22 @@ def custom_resolver(name):
 def test_deprecated_dataclass_json_dict_namespace():
     @dataclasses.dataclass
     class HasOldJsonDict:
+        # Required for testing serialization of non-cirq objects.
+        __module__: ClassVar = 'test.noncirq.namespace'  # type: ignore
         x: int
 
         def _json_dict_(self):
-            return json_serialization.dataclass_json_dict(self, namespace='cirq.testing')
+            return json_serialization.dataclass_json_dict(self, namespace='test.noncirq.namespace')
 
         @classmethod
         def _from_json_dict_(cls, x, **kwargs):
             return cls(x)
 
+    with pytest.raises(ValueError, match='not a Cirq type'):
+        _ = cirq.json_cirq_type(HasOldJsonDict)
+
     def custom_resolver(name):
-        if name == 'cirq.testing.HasOldJsonDict':
+        if name == 'test.noncirq.namespace.HasOldJsonDict':
             return HasOldJsonDict
 
     test_resolvers = [custom_resolver] + cirq.DEFAULT_RESOLVERS