Skip to content

Indenting multiline argument and exception details #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hiranya911 merged 1 commit into from
Apr 3, 2017
Merged

Indenting multiline argument and exception details #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions firebase_admin/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def initialize_app(credential=None, options=None, name=_DEFAULT_APP_NAME):

Args:
credential: A credential object used to initialize the SDK (optional). If none is provided,
Google Application Default Credentials are used.
Google Application Default Credentials are used.
options: A dictionary of configuration options (optional).
name: Name of the app (optional).

Expand All @@ -36,7 +36,7 @@ def initialize_app(credential=None, options=None, name=_DEFAULT_APP_NAME):

Raises:
ValueError: If the app name is already in use, or any of the
provided arguments are invalid.
provided arguments are invalid.
"""
if credential is None:
credential = credentials.ApplicationDefault()
Expand Down Expand Up @@ -100,7 +100,7 @@ def get_app(name=_DEFAULT_APP_NAME):

Raises:
ValueError: If the specified name is not a string, or if the specified
app does not exist.
app does not exist.
"""
if not isinstance(name, six.string_types):
raise ValueError('Illegal app name argument type: "{}". App name '
Expand Down
10 changes: 4 additions & 6 deletions firebase_admin/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def create_custom_token(uid, developer_claims=None, app=None):
Args:
uid: ID of the user for whom the token is created.
developer_claims: A dictionary of claims to be included in the token
(optional).
(optional).
app: An App instance (optional).

Returns:
Expand Down Expand Up @@ -97,9 +97,8 @@ def verify_id_token(id_token, app=None):

Raises:
ValueError: If the input parameters are invalid, or if the App was not
initialized with a credentials.Certificate.
AppIdenityError: The JWT was found to be invalid, the message will contain
details.
initialized with a credentials.Certificate.
AppIdenityError: The JWT was found to be invalid, the message will contain details.
"""
token_generator = _get_token_generator(app)
return token_generator.verify_id_token(id_token)
Expand Down Expand Up @@ -199,8 +198,7 @@ def verify_id_token(self, id_token):

Raises:
ValueError: The app was not initialized with a credentials.Certificate instance.
AppIdenityError: The JWT was found to be invalid, the message will
contain details.
AppIdenityError: The JWT was found to be invalid, the message will contain details.
"""
if not id_token:
raise ValueError('Illegal ID token provided: {0}. ID token must be a non-empty '
Expand Down
2 changes: 1 addition & 1 deletion firebase_admin/credentials.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def __init__(self):

Raises:
oauth2client.client.ApplicationDefaultCredentialsError: If Application Default
credentials cannot be initialized in the current environment.
credentials cannot be initialized in the current environment.
"""
super(ApplicationDefault, self).__init__()
self._g_credential = client.GoogleCredentials.get_application_default()
Expand Down
2 changes: 1 addition & 1 deletion firebase_admin/jwt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def decode(token):

Returns:
tuple: A 2-tuple where the first element is a dictionary of JWT headers,
and the second element is a dictionary of payload claims.
and the second element is a dictionary of payload claims.

Raises:
AppIdentityError: If the token is malformed or badly formatted
Expand Down