[Mgmt] serialization error when setting model property with `azure.co…

…re.serialization.NULL` (#2607)
Azure · May 31, 2024 · 8a37852 · 8a37852
1 parent 0b91f03
commit 8a37852
Show file tree

Hide file tree

Showing 281 changed files with 309 additions and 280 deletions.
diff --git a/.chronus/changes/fix-serialization-error-2024-4-31-14-35-50.md b/.chronus/changes/fix-serialization-error-2024-4-31-14-35-50.md
@@ -0,0 +1,8 @@
+---
+changeKind: fix
+packages:
+  - "@autorest/python"
+  - "@azure-tools/typespec-python"
+---
+
+Fix serialization error when setting model property with `azure.core.serialization.NULL`.
diff --git a/packages/autorest.python/autorest/codegen/templates/serialization.py.jinja2 b/packages/autorest.python/autorest/codegen/templates/serialization.py.jinja2
@@ -1447,7 +1447,7 @@ class Deserializer(object):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...pecification/azure_key_credential/generated/azure/key/credential/sample/_serialization.py b/...pecification/azure_key_credential/generated/azure/key/credential/sample/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...utorest.python/samples/specification/basic/generated/azure/basic/sample/_serialization.py b/...utorest.python/samples/specification/basic/generated/azure/basic/sample/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...thon/samples/specification/directives/generated/azure/directives/sample/_serialization.py b/...thon/samples/specification/directives/generated/azure/directives/sample/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...est.python/samples/specification/management/generated/azure/mgmt/sample/_serialization.py b/...est.python/samples/specification/management/generated/azure/mgmt/sample/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...t.python/samples/specification/multiapi/generated/azure/multiapi/sample/_serialization.py b/...t.python/samples/specification/multiapi/generated/azure/multiapi/sample/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...st/azure/legacy/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/_serialization.py b/...st/azure/legacy/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...thon/test/azure/legacy/Expected/AcceptanceTests/AzureReport/azurereport/_serialization.py b/...thon/test/azure/legacy/Expected/AcceptanceTests/AzureReport/azurereport/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...ure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/_serialization.py b/...ure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...ure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_serialization.py b/...ure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...es/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/_serialization.py b/...es/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...est/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/_serialization.py b/...est/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...Tests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_serialization.py b/...Tests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...ages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/_serialization.py b/...ages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...ptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/_serialization.py b/...ptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...t/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/_serialization.py b/...t/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/.../Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/_serialization.py b/.../Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...xpected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/_serialization.py b/...xpected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...pected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/_serialization.py b/...pected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...pected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/_serialization.py b/...pected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/_serialization.py b/...legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...utorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/_serialization.py b/...utorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...e/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_serialization.py b/...e/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...e/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_serialization.py b/...e/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...t/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/_serialization.py b/...t/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...ected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_serialization.py b/...ected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...tanceTests/AzureBodyDurationVersionTolerant/bodydurationversiontolerant/_serialization.py b/...tanceTests/AzureBodyDurationVersionTolerant/bodydurationversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...eParameterGroupingVersionTolerant/azureparametergroupingversiontolerant/_serialization.py b/...eParameterGroupingVersionTolerant/azureparametergroupingversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...d/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/_serialization.py b/...d/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...ests/AzureSpecialsVersionTolerant/azurespecialpropertiesversiontolerant/_serialization.py b/...ests/AzureSpecialsVersionTolerant/azurespecialpropertiesversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...ceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/_serialization.py b/...ceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...Tests/CustomPollerPagerVersionTolerant/custompollerpagerversiontolerant/_serialization.py b/...Tests/CustomPollerPagerVersionTolerant/custompollerpagerversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...Tests/CustomUrlPagingVersionTolerant/custombaseurlpagingversiontolerant/_serialization.py b/...Tests/CustomUrlPagingVersionTolerant/custombaseurlpagingversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...ptanceTests/HeadExceptionsVersionTolerant/headexceptionsversiontolerant/_serialization.py b/...ptanceTests/HeadExceptionsVersionTolerant/headexceptionsversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...lerant/Expected/AcceptanceTests/HeadVersionTolerant/headversiontolerant/_serialization.py b/...lerant/Expected/AcceptanceTests/HeadVersionTolerant/headversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...ected/AcceptanceTests/LroPagingVersionTolerant/lropagingversiontolerant/_serialization.py b/...ected/AcceptanceTests/LroPagingVersionTolerant/lropagingversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...tolerant/Expected/AcceptanceTests/LroVersionTolerant/lroversiontolerant/_serialization.py b/...tolerant/Expected/AcceptanceTests/LroVersionTolerant/lroversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...edEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/_serialization.py b/...edEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...nt/Expected/AcceptanceTests/PagingVersionTolerant/pagingversiontolerant/_serialization.py b/...nt/Expected/AcceptanceTests/PagingVersionTolerant/pagingversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...anceTests/StorageManagementClientVersionTolerant/storageversiontolerant/_serialization.py b/...anceTests/StorageManagementClientVersionTolerant/storageversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...tionIdApiVersionVersionTolerant/subscriptionidapiversionversiontolerant/_serialization.py b/...tionIdApiVersionVersionTolerant/subscriptionidapiversionversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...tionCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/_serialization.py b/...tionCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diff --git a/...tomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/_serialization.py b/...tomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/_serialization.py
@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore