Merge pull request #5 from iterative/fix-a-few-issues

Fix dependencies
iterative · Jan 24, 2020 · 330c4f9 · 330c4f9
2 parents 362bc9a + 7a1463a
commit 330c4f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pydrive2/files.py b/pydrive2/files.py
@@ -65,8 +65,11 @@ def _GetList(self):
     self['supportsTeamDrives'] = True
     self['includeTeamDriveItems'] = True
 
-    self.metadata = self.auth.service.files().list(**dict(self)).execute(
-      http=self.http)
+    try:
+      self.metadata = self.auth.service.files().list(**dict(self)).execute(
+        http=self.http)
+    except errors.HttpError as error:
+      raise ApiRequestError(error)
 
     result = []
     for file_metadata in self.metadata['items']:

diff --git a/setup.py b/setup.py
@@ -16,6 +16,7 @@
         "google-api-python-client >= 1.2",
         "oauth2client >= 4.0.0",
         "PyYAML >= 3.0",
+        "httplib2 <= 0.15.0"
     ],
     extras_require={
         "tests": ["timeout-decorator"],