service account constructor added

condad · condad · commit e5fd6432cef0 · 2017-08-02T22:21:33.000-04:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Google Objects
 Thin, pythonic OO wrapper around Google's "google-api-python-client" library.
-Currently supports Python 2.7 :snake::snake::snake:
+Currently supports Python 3+ :snake::snake::snake:
 
 ## Installation
 ```bash
@@ -20,11 +20,11 @@ from google_objects import DriveClient
 gdrive = DriveClient(OAUTH2LIB_CREDS)
 about = gdrive.get_about()
 
-print about.email
-print about.name
+print(about.email)
+print(about.name)
 
 # prints link to profile photo
-print about.photo
+print(about.photo)
 
 # ...
 ```
@@ -39,12 +39,12 @@ files_by_type = {
 }
 
 for file in files_by_type['folders']:
-    print file.id
-    print file.name
+    print(file.id)
+    print(file.name)
 
 for file in files_by_type['spreadsheets']:
     # prints list of parent folder IDs
-    print file.parents
+    print(file.parents)
 
 # ...
 ```
@@ -59,7 +59,7 @@ new_file = file.copy('NEW_FILE_NAME', ['PARENT_FOLDER_1', 'PARENT_FOLDER_2'])
 permission = new_file.add_permission('myfriend@hotmail.com')
 
 # print newly created permission information
-print permission.role, permission.type, permission.email
+print(permission.role, permission.type, permission.email)
 ```
 
 ### Google Slides v1
@@ -74,19 +74,19 @@ presentation = gslides.get_presentation('PRESENTATION_ID')
 
 # print slides attributes
 for slide in presentation:
-    print slide.id
+    print(slide.id)
 
     for element in slide: # equivalent to 'for element in presentation.elements()'  
-      print element.type 
-      # Shape, Table, etc
+        print(element.type) 
+        # Shape, Table, etc
 ```
 
 - [x] Check text in shape:
 
 ```python
 shape = presentation.get_element_by_id('SHAPE_ID')
 for segment in shape.text:
-    print segment.text
+    print(segment.text)
 ```
 
 - [x] Batch update every cell in table:
@@ -96,7 +96,7 @@ for segment in shape.text:
 with presentation as pres:
     table = pres.get_element_by_id('TABLE_ID')
     for cell in table:
-        print cell.location # tuple containing cell location
+        print(cell.location) # tuple containing cell location
         for segment in cell.text:
             # update cell
             segment.text = 'UPDATED_VALUE'
@@ -113,7 +113,7 @@ gsheets = SheetsClient(OAUTHLIB_CREDS)
 spreadsheet = gsheets.get_spreadsheet('SPREADSHEET_ID')
 
 for sheet in spreadsheet:
-    print sheet.id, sheet.title
+    print(sheet.id, sheet.title)
 ```
 
 - [x] Get sheet by name and return its full block of values:
@@ -138,7 +138,7 @@ values = spreadsheet.get_range('SHEET_NAME!A:C')
 # loop through rows
 for i, row in enumerate(values):
     values[i] = [1, 2, 3]
-    print row
+    print(row)
 values.update()
 
 # you can also use the slice syntax for updating..
diff --git a/google_objects/__init__.py b/google_objects/__init__.py
@@ -54,9 +54,15 @@ def build(self, service, version, **kwargs):
         return discovery.build(service, version, http=http, **kwargs)
 
     @classmethod
-    def from_service_account(cls, creds_path, scope=SCOPES, user=None):
+    def from_service_account(cls, creds_path=None, user=None, scope=SCOPES):
         from oauth2client.service_account import ServiceAccountCredentials as S
 
+        if not creds_path:
+            creds_path = os.getenv('GOOGLE_SERVICE_ACCOUNT_CREDENTIALS')
+
+        if not user:
+            user = os.getenv('GOOGLE_DELEGATED_USER')
+
         creds_path = os.path.expanduser(creds_path)
         creds = S.from_json_keyfile_name(creds_path, _gen_scopes(scope))
 
diff --git a/google_objects/drive/core.py b/google_objects/drive/core.py
@@ -144,8 +144,6 @@ def create_permission(self, file_id, permission, message=None, notification=True
         return Permission(**data)
 
 
-# objects
-
 class About(GoogleObject):
 
     """Docstring for User Resource, this is READ ONLY"""
diff --git a/google_objects/sheets/core.py b/google_objects/sheets/core.py
@@ -75,6 +75,11 @@ def __init__(self, credentials=None, api_key=None, callback=None):
         super(self.__class__, self).__init__(credentials, api_key)
         self._resource = self.build('sheets', 'v4')
 
+    @classmethod
+    def from_service_account(cls, **kwargs):
+        kwargs['scope'] = ['spreadsheets']
+        return super().from_service_account(**kwargs)
+
     def get_spreadsheet(self, id):
         """Returns a Spreadsheet Object
 
diff --git a/google_objects/utils.py b/google_objects/utils.py
@@ -6,17 +6,6 @@
 """
 
 import re
-from functools import wraps
-
-
-def handle_key_error(func):
-    @wraps(func)
-    def func_wrapper(self):
-        try:
-            return func(self)
-        except KeyError:
-            return
-    return func_wrapper
 
 
 def set_private_attrs(instance, dt):
@@ -92,11 +81,3 @@ def keys_to_camel(dt):
         dt[new_key] = dt.pop(key)
 
     return dt
-
-if __name__ == '__main__':
-    dt = {
-        'pageElements': 'test',
-        'otherPresentation': 3
-    }
-
-    print(keys_to_snake(dt))
