pulled master

README.md

@@ -1,2 +1,6 @@
-# google_api_wrapper
+# Google API Wrapper
+Simple wrapper around the google-python rest api aiming to make interaction with google services easy and intuitive as possible.
+## Todo
+* Stop using oauth2client since it is deprecated
+* Completely test all drive functionality
 

gapi/drive_api.py

@@ -1,4 +1,4 @@
-from magic import from_file
+# from magic import from_file
 from gapi.api import API
 from posixpath import join as pathjoin
 from googleapiclient.http import MediaFileUpload

requirements.txt

@@ -1,2 +1,4 @@
 google-api-python-client
 python-dateutil
+oauth2client
+tzlocal