Merge pull request #20 from Microsoft/users/tedchamb/futures

tedchamb · web-flow · commit 59975435e4ba · 2017-11-12T20:47:10.000-05:00
ensure classes are inheriting from object so they can be official types.
diff --git a/vsts/vsts/build/v4_0/build_client.py b/vsts/vsts/build/v4_0/build_client.py
@@ -18,7 +18,7 @@ class BuildClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(BuildClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/build/v4_1/build_client.py b/vsts/vsts/build/v4_1/build_client.py
@@ -18,7 +18,7 @@ class BuildClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(BuildClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/core/v4_0/core_client.py b/vsts/vsts/core/v4_0/core_client.py
@@ -18,7 +18,7 @@ class CoreClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(CoreClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/core/v4_1/core_client.py b/vsts/vsts/core/v4_1/core_client.py
@@ -18,7 +18,7 @@ class CoreClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(CoreClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/customer_intelligence/v4_0/customer_intelligence_client.py b/vsts/vsts/customer_intelligence/v4_0/customer_intelligence_client.py
@@ -18,7 +18,7 @@ class CustomerIntelligenceClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(CustomerIntelligenceClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/customer_intelligence/v4_1/customer_intelligence_client.py b/vsts/vsts/customer_intelligence/v4_1/customer_intelligence_client.py
@@ -18,7 +18,7 @@ class CustomerIntelligenceClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(CustomerIntelligenceClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/exceptions.py b/vsts/vsts/exceptions.py
@@ -3,16 +3,11 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from .models.wrapped_exception import WrappedException
 from msrest.exceptions import (
     ClientException,
-    SerializationError,
-    DeserializationError,
     TokenExpiredError,
     ClientRequestError,
     AuthenticationError,
-    HttpOperationError,
-    ValidationError,
 )
 
 
@@ -36,7 +31,8 @@ def __init__(self, wrapped_exception):
         self.inner_exception = None
         if wrapped_exception.inner_exception is not None:
             self.inner_exception = VstsServiceError(wrapped_exception.inner_exception)
-        super(VstsServiceError, self).__init__(message=wrapped_exception.message, inner_exception=self.inner_exception)
+        super(VstsServiceError, self).__init__(message=wrapped_exception.message,
+                                               inner_exception=self.inner_exception)
         self.message = wrapped_exception.message
         self.exception_id = wrapped_exception.exception_id
         self.type_name = wrapped_exception.type_name
diff --git a/vsts/vsts/git/v4_0/git_client.py b/vsts/vsts/git/v4_0/git_client.py
@@ -18,7 +18,7 @@ class GitClient(GitClientBase):
     """
 
     def __init__(self, base_url=None, creds=None):
-        GitClientBase.__init__(self, base_url, creds)
+        super(GitClient, self).__init__(base_url, creds)
 
     def get_vsts_info(self, relative_remote_url):
         request = ClientRequest()
diff --git a/vsts/vsts/git/v4_0/git_client_base.py b/vsts/vsts/git/v4_0/git_client_base.py
@@ -18,7 +18,7 @@ class GitClientBase(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(GitClientBase, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/git/v4_1/git_client_base.py b/vsts/vsts/git/v4_1/git_client_base.py
@@ -18,7 +18,7 @@ class GitClientBase(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(GitClientBase, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/identity/v4_0/identity_client.py b/vsts/vsts/identity/v4_0/identity_client.py
@@ -18,7 +18,7 @@ class IdentityClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(IdentityClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/identity/v4_1/identity_client.py b/vsts/vsts/identity/v4_1/identity_client.py
@@ -18,7 +18,7 @@ class IdentityClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(IdentityClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/location/v4_0/location_client.py b/vsts/vsts/location/v4_0/location_client.py
@@ -18,7 +18,7 @@ class LocationClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(LocationClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/location/v4_1/location_client.py b/vsts/vsts/location/v4_1/location_client.py
@@ -18,7 +18,7 @@ class LocationClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(LocationClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/operations/v4_0/operations_client.py b/vsts/vsts/operations/v4_0/operations_client.py
@@ -18,7 +18,7 @@ class OperationsClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(OperationsClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/operations/v4_1/operations_client.py b/vsts/vsts/operations/v4_1/operations_client.py
@@ -18,7 +18,7 @@ class OperationsClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(OperationsClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/policy/v4_0/policy_client.py b/vsts/vsts/policy/v4_0/policy_client.py
@@ -18,7 +18,7 @@ class PolicyClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(PolicyClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/policy/v4_1/policy_client.py b/vsts/vsts/policy/v4_1/policy_client.py
@@ -18,7 +18,7 @@ class PolicyClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(PolicyClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/vss_client.py b/vsts/vsts/vss_client.py
@@ -20,7 +20,7 @@
 from ._file_cache import OPTIONS_CACHE as OPTIONS_FILE_CACHE
 
 
-class VssClient:
+class VssClient(object):
     """VssClient.
     :param str base_url: Service URL
     :param Authentication creds: Authenticated credentials.
diff --git a/vsts/vsts/vss_connection.py b/vsts/vsts/vss_connection.py
@@ -12,7 +12,7 @@
 from .vss_client_configuration import VssClientConfiguration
 
 
-class VssConnection:
+class VssConnection(object):
     """VssConnection.
     """
 
diff --git a/vsts/vsts/work_item_tracking/v4_0/work_item_tracking_client.py b/vsts/vsts/work_item_tracking/v4_0/work_item_tracking_client.py
@@ -18,7 +18,7 @@ class WorkItemTrackingClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(WorkItemTrackingClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
diff --git a/vsts/vsts/work_item_tracking/v4_1/work_item_tracking_client.py b/vsts/vsts/work_item_tracking/v4_1/work_item_tracking_client.py
@@ -18,7 +18,7 @@ class WorkItemTrackingClient(VssClient):
     """
 
     def __init__(self, base_url=None, creds=None):
-        VssClient.__init__(self, base_url, creds)
+        super(WorkItemTrackingClient, self).__init__(base_url, creds)
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
