aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Wayne Parrott <jonwayne@google.com>2016-08-11 14:02:10 -0700
committerJon Wayne Parrott <jonwayne@google.com>2016-08-15 10:26:34 -0700
commita1136db2ebf19243ec43cd4ff6958812ad114ef8 (patch)
tree7d9dd0b637eb2feace689c2a5ae90086c3736ed3
parentc6b30bf420b3e63ed086c1fecad4b7aa2adb5089 (diff)
downloadoauth2client-a1136db2ebf19243ec43cd4ff6958812ad114ef8.tar.gz
Remove __author__ lines, add contributors.md
Resolves #626
-rw-r--r--CONTRIBUTORS.md95
-rw-r--r--oauth2client/_helpers.py5
-rw-r--r--oauth2client/client.py2
-rw-r--r--oauth2client/clientsecrets.py1
-rw-r--r--oauth2client/contrib/appengine.py2
-rw-r--r--oauth2client/contrib/flask_util.py2
-rw-r--r--oauth2client/contrib/gce.py2
-rw-r--r--oauth2client/contrib/keyring_storage.py3
-rw-r--r--oauth2client/contrib/xsrfutil.py4
-rw-r--r--oauth2client/file.py3
-rw-r--r--oauth2client/tools.py1
-rw-r--r--tests/contrib/appengine/test_appengine.py1
-rw-r--r--tests/contrib/test_flask_util.py3
-rw-r--r--tests/contrib/test_keyring_storage.py3
-rw-r--r--tests/contrib/test_xsrfutil.py3
-rw-r--r--tests/test__helpers.py3
-rw-r--r--tests/test_client.py1
-rw-r--r--tests/test_clientsecrets.py3
-rw-r--r--tests/test_file.py2
-rw-r--r--tests/test_jwt.py3
20 files changed, 95 insertions, 47 deletions
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 <aalexand@google.com>
+* Aaron <aaronwinter@users.noreply.github.com>
+* Adam Chainz <me@adamj.eu>
+* ade@google.com
+* Alexandre Vivien <alx.vivien@gmail.com>
+* Ali Afshar <afshar@google.com>
+* Andrzej Pragacz <apragacz@o2.pl>
+* api.nickm@gmail.com
+* Ben Demaree <bendemaree@gmail.com>
+* Bill Prin <waprin@gmail.com, waprin@google.com>
+* Brendan McCollam <brendan@mccoll.am, bmccollam@uchicago.edu>
+* Craig Citro <craigcitro@gmail.com, craigcitro@google.com>
+* Dan Ring <dfring@gmail.com>
+* Daniel Hermes <dhermes@google.com, daniel.j.hermes@gmail.com>
+* Danilo Akamine <danilowz@gmail.com>
+* daryl herzmann <akrherz@iastate.edu>
+* dlorenc <lorenc.d@gmail.com>
+* Dominik Miedziński <dominik@mdzn.pl>
+* dr. Kertész Csaba-Zoltán <cskertesz@gmail.com>
+* Dustin Farris <dustin@dustinfarris.com>
+* Eddie Warner <happyspace@gmail.com>
+* Edwin Amsler <EdwinGuy@GMail.com>
+* elibixby <elibixby@google.com>
+* Emanuele Pucciarelli <ep@acm.org>
+* Eric Koleda <eric.koleda@google.com>
+* Frederik Creemers <frederikcreemers@gmail.com>
+* Guido van Rossum <guido@google.com>
+* Harsh Vardhan <harshvd95@gmail.com>
+* Herr Kaste <thdz.x@gmx.net>
+* INADA Naoki <inada-n@klab.com>
+* JacobMoshenko <moshenko@google.com>
+* Jay Lee <jay0lee@gmail.com>
+* Jed Hartman <jhartman@google.com>
+* Jeff Terrace <jterrace@gmail.com, jterrace@google.com>
+* Jeffrey Sorensen <sorensenjs@users.noreply.github.com>
+* Jeremi Joslin <jeremi@collabspot.com>
+* Jin Liu <liujin@google.com>
+* Joe Beda <jbeda@google.com>
+* Joe Gregorio <jcgregorio@google.com, joe.gregorio@gmail.com>
+* Johan Euphrosine <proppy@google.com>
+* John Asmuth <jasmuth@gmail.com, jasmuth@google.com>
+* John Vandenberg <jayvdb@gmail.com>
+* Jon Wayne Parrott <jon.wayne.parrott@gmail.com, jonwayne@google.com>
+* Jose Alcerreca <jalc@google.com>
+* KCs <cskertesz@gmail.com>
+* Keith Maxwell <keith.maxwell@gmail.com>
+* Ken Payson <kpayson@google.com>
+* Kevin Regan <regank@google.com>
+* lraccomando <lraccomando@gmail.com>
+* Luar Roji <cyberplant@users.noreply.github.com>
+* Luke Blanshard <leadpipe@google.com>
+* Marc Cohen <marccohen@google.com>
+* Mark Pellegrini <markpell@google.com>
+* Martin Trigaux <mat@odoo.com>
+* Matt McDonald <mmcdonald@google.com>
+* Nathan Naze <nanaze@gmail.com>
+* Nathaniel Manista <nathaniel@google.com>
+* Orest Bolohan <orest@google.com>
+* Pat Ferate <pferate@gmail.com>
+* Patrick Costello <pcostello@google.com>
+* Rafe Kaplan <rafek@google.com>
+* rahulpaul@google.com <rahulpaul@google.com>
+* RM Saksida <rsaksida@gmail.com>
+* Robert Kaplow <rkaplow@google.com>
+* Robert Spies <wilford@google.com>
+* Sergei Trofimovich <siarheit@google.com>
+* sgomes@google.com <sgomes@google.com>
+* Simon Cadman <src@niftiestsoftware.com>
+* soltanmm <soltanmm@users.noreply.github.com>
+* Sébastien de Melo <sebastien.de-melo@ubicast.eu>
+* takuya sato <sato-taku@klab.com>
+* thobrla <thobrla@google.com>
+* Tom Miller <tom.h.miller@gmail.com>
+* Tony Aiuto <aiuto@google.com>
+* Travis Hobrla <thobrla@google.com>
+* Veres Lajos <vlajos@gmail.com>
+* Vivek Seth <vivekseth.m@gmail.com>
+* Éamonn McManus <eamonn@mcmanus.net>
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" <dcoker@google.com>',
- '"Joe Gregorio" <jcgregorio@google.com>',
-]
# 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',