Fix google auth request import

HumanCellAtlas · Aug 2, 2017 · c1abdf3 · c1abdf3
1 parent 740f151
commit c1abdf3
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/hca/added_command.py b/hca/added_command.py
@@ -6,6 +6,7 @@
 import jsonschema
 import requests
 from google import auth
+from google.auth.transport.requests import Request
 from googleapiclient import sample_tools
 
 from .constants import Constants
@@ -223,7 +224,11 @@ def _get_auth_header(cls, real_header=True):
         try:
             credentials, project_id = auth.default(scopes=["https://www.googleapis.com/auth/userinfo.email"])
 
+<<<<<<< HEAD
             r = auth.transport.requests.Request()
+=======
+            r = Request()
+>>>>>>> 6c842ef... Fix google auth request import
             credentials.refresh(r)
             r.session.close()