HTTPTransport: ignore credentials if auth is given

core-api · blueyed · Sep 12, 2017 · Sep 12, 2017 · Sep 12, 2017 · Sep 12, 2017
commit d0f9d041722c462520848fe98bc1e5b1854ecbd4
diff --git a/coreapi/transports/http.py b/coreapi/transports/http.py
@@ -345,11 +345,14 @@ def __init__(self, credentials=None, headers=None, auth=None, session=None, requ
             session.cookies.set_policy(BlockAll())
 
         if credentials is not None:
-            warnings.warn(
-                "The 'credentials' argument is now deprecated in favor of 'auth'.",
-                DeprecationWarning
-            )
-            session.auth = DomainCredentials(credentials)
+            if auth is not None:
+                warnings.warn("Ignoring 'credentials' argument in favor of 'auth'.")
+            else:
+                warnings.warn(
+                    "The 'credentials' argument is now deprecated in favor of 'auth'.",
+                    DeprecationWarning
+                )
+                session.auth = DomainCredentials(credentials)
         if request_callback is not None or response_callback is not None:
             warnings.warn(
                 "The 'request_callback' and 'response_callback' arguments are now deprecated. "