From a1136db2ebf19243ec43cd4ff6958812ad114ef8 Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Thu, 11 Aug 2016 14:02:10 -0700 Subject: [PATCH] Remove __author__ lines, add contributors.md Resolves #626 --- CONTRIBUTORS.md | 95 +++++++++++++++++++++++ oauth2client/_helpers.py | 5 -- oauth2client/client.py | 2 - oauth2client/clientsecrets.py | 1 - oauth2client/contrib/appengine.py | 2 - oauth2client/contrib/flask_util.py | 2 - oauth2client/contrib/gce.py | 2 - oauth2client/contrib/keyring_storage.py | 3 - oauth2client/contrib/xsrfutil.py | 4 - oauth2client/file.py | 3 - oauth2client/tools.py | 1 - tests/contrib/appengine/test_appengine.py | 1 - tests/contrib/test_flask_util.py | 3 - tests/contrib/test_keyring_storage.py | 3 - tests/contrib/test_xsrfutil.py | 3 - tests/test__helpers.py | 3 - tests/test_client.py | 1 - tests/test_clientsecrets.py | 3 - tests/test_file.py | 2 - tests/test_jwt.py | 3 - 20 files changed, 95 insertions(+), 47 deletions(-) create mode 100644 CONTRIBUTORS.md diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 0000000..00bd09f --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,95 @@ +# Contribors to oauth2client + +## Maintainers + +* [Nathaniel Manista](https://github.com/nathanielmanistaatgoogle) +* [Jon Wayne Parrott](https://github.com/jonparrott) +* [Danny Hermes](https://github.com/dhermes) + +Previous maintainers: + +* [Craig Citro](https://github.com/craigcitro) +* [Joe Gregorio](https://github.com/jcgregorio) + +## Contributors + +This list is generated from git commit authors. + +* aalexand +* Aaron +* Adam Chainz +* ade@google.com +* Alexandre Vivien +* Ali Afshar +* Andrzej Pragacz +* api.nickm@gmail.com +* Ben Demaree +* Bill Prin +* Brendan McCollam +* Craig Citro +* Dan Ring +* Daniel Hermes +* Danilo Akamine +* daryl herzmann +* dlorenc +* Dominik Miedziński +* dr. Kertész Csaba-Zoltán +* Dustin Farris +* Eddie Warner +* Edwin Amsler +* elibixby +* Emanuele Pucciarelli +* Eric Koleda +* Frederik Creemers +* Guido van Rossum +* Harsh Vardhan +* Herr Kaste +* INADA Naoki +* JacobMoshenko +* Jay Lee +* Jed Hartman +* Jeff Terrace +* Jeffrey Sorensen +* Jeremi Joslin +* Jin Liu +* Joe Beda +* Joe Gregorio +* Johan Euphrosine +* John Asmuth +* John Vandenberg +* Jon Wayne Parrott +* Jose Alcerreca +* KCs +* Keith Maxwell +* Ken Payson +* Kevin Regan +* lraccomando +* Luar Roji +* Luke Blanshard +* Marc Cohen +* Mark Pellegrini +* Martin Trigaux +* Matt McDonald +* Nathan Naze +* Nathaniel Manista +* Orest Bolohan +* Pat Ferate +* Patrick Costello +* Rafe Kaplan +* rahulpaul@google.com +* RM Saksida +* Robert Kaplow +* Robert Spies +* Sergei Trofimovich +* sgomes@google.com +* Simon Cadman +* soltanmm +* Sébastien de Melo +* takuya sato +* thobrla +* Tom Miller +* Tony Aiuto +* Travis Hobrla +* Veres Lajos +* Vivek Seth +* Éamonn McManus diff --git a/oauth2client/_helpers.py b/oauth2client/_helpers.py index 043a2d8..79586a5 100644 --- a/oauth2client/_helpers.py +++ b/oauth2client/_helpers.py @@ -26,11 +26,6 @@ import six from six.moves import urllib -__author__ = ( - 'rafek@google.com (Rafe Kaplan)', - 'guido@google.com (Guido van Rossum)', -) - logger = logging.getLogger(__name__) POSITIONAL_WARNING = 'WARNING' diff --git a/oauth2client/client.py b/oauth2client/client.py index 2d1f6e8..77106db 100644 --- a/oauth2client/client.py +++ b/oauth2client/client.py @@ -39,8 +39,6 @@ from oauth2client import clientsecrets from oauth2client import transport -__author__ = 'jcgregorio@google.com (Joe Gregorio)' - HAS_OPENSSL = False HAS_CRYPTO = False try: diff --git a/oauth2client/clientsecrets.py b/oauth2client/clientsecrets.py index 4b43e66..1598142 100644 --- a/oauth2client/clientsecrets.py +++ b/oauth2client/clientsecrets.py @@ -22,7 +22,6 @@ import json import six -__author__ = 'jcgregorio@google.com (Joe Gregorio)' # Properties that make a client_secrets.json file valid. TYPE_WEB = 'web' diff --git a/oauth2client/contrib/appengine.py b/oauth2client/contrib/appengine.py index a3df769..c1326ee 100644 --- a/oauth2client/contrib/appengine.py +++ b/oauth2client/contrib/appengine.py @@ -45,8 +45,6 @@ except ImportError: # pragma: NO COVER _appengine_ndb = None -__author__ = 'jcgregorio@google.com (Joe Gregorio)' - logger = logging.getLogger(__name__) OAUTH2CLIENT_NAMESPACE = 'oauth2client#ns' diff --git a/oauth2client/contrib/flask_util.py b/oauth2client/contrib/flask_util.py index 3a6fe0b..6d7d8f7 100644 --- a/oauth2client/contrib/flask_util.py +++ b/oauth2client/contrib/flask_util.py @@ -187,8 +187,6 @@ from oauth2client import transport from oauth2client.contrib import dictionary_storage -__author__ = 'jonwayne@google.com (Jon Wayne Parrott)' - _DEFAULT_SCOPES = ('email',) _CREDENTIALS_KEY = 'google_oauth2_credentials' _FLOW_KEY = 'google_oauth2_flow_{0}' diff --git a/oauth2client/contrib/gce.py b/oauth2client/contrib/gce.py index d1510db..aaab15f 100644 --- a/oauth2client/contrib/gce.py +++ b/oauth2client/contrib/gce.py @@ -26,8 +26,6 @@ from oauth2client import client from oauth2client.contrib import _metadata -__author__ = 'jcgregorio@google.com (Joe Gregorio)' - logger = logging.getLogger(__name__) _SCOPES_WARNING = """\ diff --git a/oauth2client/contrib/keyring_storage.py b/oauth2client/contrib/keyring_storage.py index f4f2e30..4af9448 100644 --- a/oauth2client/contrib/keyring_storage.py +++ b/oauth2client/contrib/keyring_storage.py @@ -24,9 +24,6 @@ import keyring from oauth2client import client -__author__ = 'jcgregorio@google.com (Joe Gregorio)' - - class Storage(client.Storage): """Store and retrieve a single credential to and from the keyring. diff --git a/oauth2client/contrib/xsrfutil.py b/oauth2client/contrib/xsrfutil.py index 4be2304..7c3ec03 100644 --- a/oauth2client/contrib/xsrfutil.py +++ b/oauth2client/contrib/xsrfutil.py @@ -21,10 +21,6 @@ import time from oauth2client import _helpers -__authors__ = [ - '"Doug Coker" ', - '"Joe Gregorio" ', -] # Delimiter character DELIMITER = b':' diff --git a/oauth2client/file.py b/oauth2client/file.py index 2cd724d..3551c80 100644 --- a/oauth2client/file.py +++ b/oauth2client/file.py @@ -25,9 +25,6 @@ from oauth2client import _helpers from oauth2client import client -__author__ = 'jcgregorio@google.com (Joe Gregorio)' - - class Storage(client.Storage): """Store and retrieve a single credential to and from a file.""" diff --git a/oauth2client/tools.py b/oauth2client/tools.py index 23bcfbd..0aa671b 100644 --- a/oauth2client/tools.py +++ b/oauth2client/tools.py @@ -34,7 +34,6 @@ from oauth2client import _helpers from oauth2client import client -__author__ = 'jcgregorio@google.com (Joe Gregorio)' __all__ = ['argparser', 'run_flow', 'message_if_missing'] _CLIENT_SECRETS_MESSAGE = """WARNING: Please configure OAuth 2.0 diff --git a/tests/contrib/appengine/test_appengine.py b/tests/contrib/appengine/test_appengine.py index 569abc9..de26ae4 100644 --- a/tests/contrib/appengine/test_appengine.py +++ b/tests/contrib/appengine/test_appengine.py @@ -40,7 +40,6 @@ from oauth2client import clientsecrets from oauth2client.contrib import appengine from tests import http_mock -__author__ = 'jcgregorio@google.com (Joe Gregorio)' DATA_DIR = os.path.join(os.path.dirname(__file__), '..', '..', 'data') DEFAULT_RESP = """\ diff --git a/tests/contrib/test_flask_util.py b/tests/contrib/test_flask_util.py index 592286e..fa018bd 100644 --- a/tests/contrib/test_flask_util.py +++ b/tests/contrib/test_flask_util.py @@ -31,9 +31,6 @@ from oauth2client.contrib import flask_util from tests import http_mock -__author__ = 'jonwayne@google.com (Jon Wayne Parrott)' - - DEFAULT_RESP = """\ { "access_token": "foo_access_token", diff --git a/tests/contrib/test_keyring_storage.py b/tests/contrib/test_keyring_storage.py index 11986be..0f8090d 100644 --- a/tests/contrib/test_keyring_storage.py +++ b/tests/contrib/test_keyring_storage.py @@ -26,9 +26,6 @@ from oauth2client import client from oauth2client.contrib import keyring_storage -__author__ = 'jcgregorio@google.com (Joe Gregorio)' - - class KeyringStorageTests(unittest.TestCase): def test_constructor(self): diff --git a/tests/contrib/test_xsrfutil.py b/tests/contrib/test_xsrfutil.py index 0538795..3115827 100644 --- a/tests/contrib/test_xsrfutil.py +++ b/tests/contrib/test_xsrfutil.py @@ -34,9 +34,6 @@ TEST_EXTRA_INFO_1 = b'extra_info_1' TEST_EXTRA_INFO_2 = b'more_extra_info' -__author__ = 'jcgregorio@google.com (Joe Gregorio)' - - class Test_generate_token(unittest.TestCase): def test_bad_positional(self): diff --git a/tests/test__helpers.py b/tests/test__helpers.py index c4387e2..57b4cb0 100644 --- a/tests/test__helpers.py +++ b/tests/test__helpers.py @@ -21,9 +21,6 @@ import mock from oauth2client import _helpers -__author__ = 'jcgregorio@google.com (Joe Gregorio)' - - class PositionalTests(unittest.TestCase): def test_usage(self): diff --git a/tests/test_client.py b/tests/test_client.py index 49a9210..16830fd 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -38,7 +38,6 @@ from oauth2client import service_account from oauth2client import transport from tests import http_mock -__author__ = 'jcgregorio@google.com (Joe Gregorio)' DATA_DIR = os.path.join(os.path.dirname(__file__), 'data') diff --git a/tests/test_clientsecrets.py b/tests/test_clientsecrets.py index 3d93eb4..3fa9c30 100644 --- a/tests/test_clientsecrets.py +++ b/tests/test_clientsecrets.py @@ -25,9 +25,6 @@ from oauth2client import _helpers from oauth2client import clientsecrets -__author__ = 'jcgregorio@google.com (Joe Gregorio)' - - DATA_DIR = os.path.join(os.path.dirname(__file__), 'data') VALID_FILE = os.path.join(DATA_DIR, 'client_secrets.json') INVALID_FILE = os.path.join(DATA_DIR, 'unfilled_client_secrets.json') diff --git a/tests/test_file.py b/tests/test_file.py index 6f75746..a443035 100644 --- a/tests/test_file.py +++ b/tests/test_file.py @@ -41,8 +41,6 @@ try: except: # pragma: NO COVER pass -__author__ = 'jcgregorio@google.com (Joe Gregorio)' - _filehandle, FILENAME = tempfile.mkstemp('oauth2client_test.data') os.close(_filehandle) diff --git a/tests/test_jwt.py b/tests/test_jwt.py index 9125c93..6502a4a 100644 --- a/tests/test_jwt.py +++ b/tests/test_jwt.py @@ -31,9 +31,6 @@ from oauth2client import transport from tests import http_mock -__author__ = 'jcgregorio@google.com (Joe Gregorio)' - - _FORMATS_TO_CONSTRUCTOR_ARGS = { 'p12': 'private_key_pkcs12', 'pem': 'private_key_pkcs8_pem',