Merge pull request #364 from JMensch/test-updates

Update oath2client credential loading in tests.

tests/test.py

@@ -11,7 +11,7 @@
 except ImportError:
     import configparser as ConfigParser
 
-from oauth2client.client import SignedJwtAssertionCredentials
+from oauth2client.service_account import ServiceAccountCredentials
 
 import gspread
 
@@ -35,10 +35,7 @@ def read_config(filename):
 
 
 def read_credentials(filename):
-    creds_data = json.load(open(filename))
-    return SignedJwtAssertionCredentials(creds_data['client_email'],
-                                         creds_data['private_key'].encode(),
-                                         SCOPE)
+    return ServiceAccountCredentials.from_json_keyfile_name(filename, SCOPE)
 
 
 def gen_value(prefix=None):
@@ -124,7 +121,7 @@ def test_worksheet(self):
         self.assertTrue(isinstance(sheet, gspread.Worksheet))
 
     def test_worksheet_iteration(self):
-        self.assertEqual(self.spreadsheet.worksheets(), 
+        self.assertEqual(self.spreadsheet.worksheets(),
             [sheet for sheet in self.spreadsheet])