From 00ff9b36010052cf11354ea6ecf5e9302e7ad86a Mon Sep 17 00:00:00 2001
From: annatisch <antisch@microsoft.com>
Date: Tue, 10 May 2016 10:20:47 -0700
Subject: [PATCH] tox cleanups

---
 .../Python/msrest/msrest/serialization.py     | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/ClientRuntimes/Python/msrest/msrest/serialization.py b/ClientRuntimes/Python/msrest/msrest/serialization.py
index f1bd12f91c93f..a39ef1679b697 100644
--- a/ClientRuntimes/Python/msrest/msrest/serialization.py
+++ b/ClientRuntimes/Python/msrest/msrest/serialization.py
@@ -143,18 +143,29 @@ def _classify(cls, response, objects):
 def _convert_to_datatype(params, localtype):
     """Convert a dict-like object to the given datatype
     """
-    return _recursive_convert_to_datatype(params, localtype.__name__, importlib.import_module('..', localtype.__module__))
+    return _recursive_convert_to_datatype(
+        params,
+        localtype.__name__,
+        importlib.import_module('..', localtype.__module__))
 
 
 def _recursive_convert_to_datatype(params, str_localtype, models_module):
     """Convert a dict-like object to the given datatype
     """
     if isinstance(params, list):
-        return [_recursive_convert_to_datatype(data, str_localtype[1:-1], models_module) for data in params]
-    localtype = getattr(models_module, str_localtype) if hasattr(models_module, str_localtype) else None
+        return [_recursive_convert_to_datatype(
+            data,
+            str_localtype[1:-1],
+            models_module) for data in params]
+    localtype = getattr(models_module, str_localtype, None)
     if not localtype:
         return params
-    result = {key: _recursive_convert_to_datatype(params[key], localtype._attribute_map[key]['type'], models_module) for key in params}
+    result = {
+        key: _recursive_convert_to_datatype(
+            params[key],
+            localtype._attribute_map[key]['type'],
+            models_module) for key in params
+    }
     return localtype(**result)
 
 
@@ -579,7 +590,8 @@ def serialize_rfc(attr, **kwargs):
         """
         try:
             if not attr.tzinfo:
-                _LOGGER.warning("Datetime with no tzinfo will be considered UTC.")
+                _LOGGER.warning(
+                    "Datetime with no tzinfo will be considered UTC.")
             utc = attr.utctimetuple()
         except AttributeError:
             raise TypeError("RFC1123 object must be valid Datetime object.")
@@ -602,7 +614,8 @@ def serialize_iso(attr, **kwargs):
         try:
             try:
                 if not attr.tzinfo:
-                    _LOGGER.warning("Datetime with no tzinfo will be considered UTC.")
+                    _LOGGER.warning(
+                        "Datetime with no tzinfo will be considered UTC.")
                 utc = attr.utctimetuple()
             except AttributeError:
                 raise TypeError(
@@ -631,9 +644,10 @@ def serialize_unix(attr, **kwargs):
         if isinstance(attr, int):
             return attr
         try:
-           if not attr.tzinfo:
-               _LOGGER.warning("Datetime with no tzinfo will be considered UTC.")
-           return int(calendar.timegm(attr.utctimetuple()))
+            if not attr.tzinfo:
+                _LOGGER.warning(
+                    "Datetime with no tzinfo will be considered UTC.")
+            return int(calendar.timegm(attr.utctimetuple()))
         except AttributeError:
             raise TypeError("Unix time object must be valid Datetime object.")
 
@@ -1088,10 +1102,9 @@ def deserialize_unix(attr):
         :raises: DeserializationError if format invalid
         """
         try:
-            date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC) 
+            date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC)
         except ValueError as err:
             msg = "Cannot deserialize to unix datetime object."
             raise_with_traceback(DeserializationError, msg, err)
         else:
             return date_obj
-