From 6500965b6d0e96f9296b61eb4d185af6cc659f52 Mon Sep 17 00:00:00 2001
From: annatisch <antisch@microsoft.com>
Date: Tue, 10 May 2016 15:27:27 -0700
Subject: [PATCH] Revert "Change body serialization for complex type"

This reverts commit 3e34c1695efe9a765bc74d13325c9177d9c4a26d.
---
 .../AzureLongRunningMethodTemplate.cshtml     | 29 +++++-------------
 .../AzurePagingMethodTemplate.cshtml          | 22 +++-----------
 .../Python/Templates/MethodTemplate.cshtml    | 30 +++++--------------
 3 files changed, 19 insertions(+), 62 deletions(-)

diff --git a/AutoRest/Generators/Python/Azure.Python/Templates/AzureLongRunningMethodTemplate.cshtml b/AutoRest/Generators/Python/Azure.Python/Templates/AzureLongRunningMethodTemplate.cshtml
index d7911a126023..78533cd45122 100644
--- a/AutoRest/Generators/Python/Azure.Python/Templates/AzureLongRunningMethodTemplate.cshtml
+++ b/AutoRest/Generators/Python/Azure.Python/Templates/AzureLongRunningMethodTemplate.cshtml
@@ -64,32 +64,17 @@
       {
         @:body_content = upload_gen(@parameter.Name)
         break;
-            }
-        }
+      }
     }
-    else if (Model.RequestBody.IsRequired)
-    {
-
-        if (Model.RequestBody.Type is CompositeType)
-        {
-        @:body_content = self._serialize.body(@Model.RequestBody.Name, models.@(Model.RequestBody.Type.ToPythonRuntimeTypeString()))
-        }
-        else
-        {
+  }
+  else if (Model.RequestBody.IsRequired)
+  {
         @:body_content = self._serialize.body(@Model.RequestBody.Name, '@(Model.RequestBody.Type.ToPythonRuntimeTypeString())')
-        }
-    }
-    else
-    {
+  }
+  else
+  {
         @:if @Model.RequestBody.Name is not None:
-            if (Model.RequestBody.Type is CompositeType)
-        {
-            @:body_content = self._serialize.body(@Model.RequestBody.Name, models.@(Model.RequestBody.Type.ToPythonRuntimeTypeString()))
-        }
-        else
-        {
             @:body_content = self._serialize.body(@Model.RequestBody.Name, '@(Model.RequestBody.Type.ToPythonRuntimeTypeString())')
-        }
         @:else:
             @:body_content = None
   }
diff --git a/AutoRest/Generators/Python/Azure.Python/Templates/AzurePagingMethodTemplate.cshtml b/AutoRest/Generators/Python/Azure.Python/Templates/AzurePagingMethodTemplate.cshtml
index 496b19a0bee7..9e3ddbbf618e 100644
--- a/AutoRest/Generators/Python/Azure.Python/Templates/AzurePagingMethodTemplate.cshtml
+++ b/AutoRest/Generators/Python/Azure.Python/Templates/AzurePagingMethodTemplate.cshtml
@@ -59,27 +59,13 @@
 {
             @:# Construct body
   if (Model.RequestBody.IsRequired)
-    {
-        if (Model.RequestBody.Type is CompositeType)
-        {
-            @:body_content = self._serialize.body(@Model.RequestBody.Name, models.@(Model.RequestBody.Type.ToPythonRuntimeTypeString()))
-        }
-        else
-        {
+  {
             @:body_content = self._serialize.body(@Model.RequestBody.Name, '@(Model.RequestBody.Type.ToPythonRuntimeTypeString())')
-        }
-    }
-    else
-    {
+  }
+  else
+  {
             @:if @Model.RequestBody.Name is not None:
-        if (Model.RequestBody.Type is CompositeType)
-        {
-                @:body_content = self._serialize.body(@Model.RequestBody.Name, models.@(Model.RequestBody.Type.ToPythonRuntimeTypeString()))
-        }
-        else
-        {
                 @:body_content = self._serialize.body(@Model.RequestBody.Name, '@(Model.RequestBody.Type.ToPythonRuntimeTypeString())')
-        }
             @:else:
                 @:body_content = None
   }
diff --git a/AutoRest/Generators/Python/Python/Templates/MethodTemplate.cshtml b/AutoRest/Generators/Python/Python/Templates/MethodTemplate.cshtml
index a97a9c8921c1..6cd57e9b0253 100644
--- a/AutoRest/Generators/Python/Python/Templates/MethodTemplate.cshtml
+++ b/AutoRest/Generators/Python/Python/Templates/MethodTemplate.cshtml
@@ -64,31 +64,17 @@
       {
         @:body_content = self._client.stream_upload(@parameter.Name, callback)
         break;
-            }
-        }
-    }
-    else if (Model.RequestBody.IsRequired)
-    {
-        if (Model.RequestBody.Type is CompositeType)
-        {
-        @:body_content = self._serialize.body(@Model.RequestBody.Name, models.@(Model.RequestBody.Type.ToPythonRuntimeTypeString()))
-        }
-        else
-        {
+      }
+    }   
+  }
+  else if (Model.RequestBody.IsRequired)
+  {
         @:body_content = self._serialize.body(@Model.RequestBody.Name, '@(Model.RequestBody.Type.ToPythonRuntimeTypeString())')
-        }
-    }
-    else
-    {
+  }
+  else
+  {
         @:if @Model.RequestBody.Name is not None:
-        if (Model.RequestBody.Type is CompositeType)
-        {
-            @:body_content = self._serialize.body(@Model.RequestBody.Name, models.@(Model.RequestBody.Type.ToPythonRuntimeTypeString()))
-        }
-        else
-        {
             @:body_content = self._serialize.body(@Model.RequestBody.Name, '@(Model.RequestBody.Type.ToPythonRuntimeTypeString())')
-        }
         @:else:
             @:body_content = None
   }