Lint changes to allow some files to be complient with newer pylint versions

Author: jkyle109

firebase_admin/_http_client_async.py

@@ -95,7 +95,7 @@ def base_url(self):
     def timeout(self):
         return self._timeout
 
-    def parse_body(self, resp):
+    async def parse_body(self, resp):
         raise NotImplementedError
 
     async def request(self, method, url, **kwargs):
@@ -124,13 +124,13 @@ class call this method to send async HTTP requests out. Refer to
         resp = await self._session.request(method, self.base_url + url, **kwargs)
         wrapped_resp = _CombinedResponse(resp)
 
-        try:
-            # Get response content from StreamReader before it is closed by error throw.
-            resp_content = await wrapped_resp.content()
-            resp.raise_for_status()
+        # Get response content from StreamReader before it is closed by error throw.
+        resp_content = await wrapped_resp.content()
 
         # Catch response error and re-release it after appending response body needed to
         # determine the underlying reason for the error.
+        try:
+            resp.raise_for_status()
         except ClientResponseError as err:
             raise ClientResponseWithBodyError(
                 err.request_info,
@@ -178,6 +178,6 @@ class ClientResponseWithBodyError(aiohttp.ClientResponseError):
     aiohttp request.
     """
     def __init__(self, request_info, history, response, response_content):
-        super(ClientResponseWithBodyError, self).__init__(request_info, history)
+        super().__init__(request_info, history)
         self.response = response
         self.response_content = response_content

firebase_admin/credentials.py

@@ -103,28 +103,28 @@ def __init__(self, cert: str) -> None:
           IOError: If the specified certificate file doesn't exist or cannot be read.
           ValueError: If the specified certificate is invalid.
         """
-        super(Certificate, self).__init__()
+        super().__init__()
         if _is_file_path(cert):
-            with open(cert) as json_file:
+            with open(cert, encoding="utf-8") as json_file:
                 json_data = json.load(json_file)
         elif isinstance(cert, dict):
             json_data = cert
         else:
             raise ValueError(
-                'Invalid certificate argument: "{0}". Certificate argument must be a file path, '
-                'or a dict containing the parsed file contents.'.format(cert))
+                f'Invalid certificate argument: "{cert}". Certificate argument must be a file '
+                'path, or a dict containing the parsed file contents.')
 
         if json_data.get('type') != self._CREDENTIAL_TYPE:
             raise ValueError('Invalid service account certificate. Certificate must contain a '
-                             '"type" field set to "{0}".'.format(self._CREDENTIAL_TYPE))
+                             f'"type" field set to "{self._CREDENTIAL_TYPE}".')
         try:
             self._g_credential = service_account.Credentials.from_service_account_info(
                 json_data, scopes=_scopes)
             self._g_credential_async = service_account_async.Credentials.from_service_account_info(
                 json_data, scopes=_scopes)
         except ValueError as error:
             raise ValueError('Failed to initialize a certificate credential. '
-                             'Caused by: "{0}"'.format(error))
+                             f'Caused by: "{error}"') from error
 
     @property
     def project_id(self) -> str:
@@ -162,7 +162,7 @@ def __init__(self) -> None:
         The credentials will be lazily initialized when get_credential(), get_credential_async()
         or project_id() is called. See those methods for possible errors raised.
         """
-        super(ApplicationDefault, self).__init__()
+        super().__init__()
         self._g_credential = None  # Will be lazily-loaded via _load_credential().
         self._g_credential_async = None  # Will be lazily-loaded via _load_credential_async().
 
@@ -229,20 +229,20 @@ def __init__(self, refresh_token: str) -> None:
           IOError: If the specified file doesn't exist or cannot be read.
           ValueError: If the refresh token configuration is invalid.
         """
-        super(RefreshToken, self).__init__()
+        super().__init__()
         if _is_file_path(refresh_token):
-            with open(refresh_token) as json_file:
+            with open(refresh_token, encoding="utf-8") as json_file:
                 json_data = json.load(json_file)
         elif isinstance(refresh_token, dict):
             json_data = refresh_token
         else:
             raise ValueError(
-                'Invalid refresh token argument: "{0}". Refresh token argument must be a file '
-                'path, or a dict containing the parsed file contents.'.format(refresh_token))
+                f'Invalid refresh token argument: "{refresh_token}". Refresh token argument must be'
+                ' a file path, or a dict containing the parsed file contents.')
 
         if json_data.get('type') != self._CREDENTIAL_TYPE:
             raise ValueError('Invalid refresh token configuration. JSON must contain a '
-                             '"type" field set to "{0}".'.format(self._CREDENTIAL_TYPE))
+                             f'"type" field set to "{self._CREDENTIAL_TYPE}".')
         self._g_credential = credentials.Credentials.from_authorized_user_info(json_data, _scopes)
         self._g_credential_async = credentials_async.Credentials.from_authorized_user_info(
             json_data,

firebase_admin/messaging_async.py

@@ -61,9 +61,9 @@
 ]
 
 # pylint: disable=unsubscriptable-object
-# TODO:(/b)Remove false positive unsubscriptable-object lint warnings caused by type hints Optional type.
-# This is fixed in pylint 2.7.0 but this version introduces new lint rules and requires multiple
-# file changes.
+# TODO:(/b)Remove false positive unsubscriptable-object lint warnings caused by type hints Optional
+# type. This is fixed in pylint 2.7.0 but this version introduces new lint rules and requires
+# multiple file changes.
 def _get_messaging_service(app: Optional[App]) -> "_MessagingServiceAsync":
     return _utils.get_app_service(app, _MESSAGING_ATTRIBUTE, _MessagingServiceAsync)
 
@@ -160,7 +160,7 @@ def __init__(self, app: App) -> None:
         self._fcm_url = _MessagingServiceAsync.FCM_URL.format(project_id)
         self._fcm_headers = {
             'X-GOOG-API-FORMAT-VERSION': '2',
-            'X-FIREBASE-CLIENT': 'fire-admin-python/{0}'.format(firebase_admin.__version__),
+            'X-FIREBASE-CLIENT': f'fire-admin-python/{firebase_admin.__version__}'
         }
         timeout = app.options.get('httpTimeout', DEFAULT_TIMEOUT_SECONDS)
         self._credential = app.credential.get_credential_async()
@@ -206,12 +206,12 @@ async def make_topic_management_request(self, tokens, topic, operation):
         if not isinstance(topic, str) or not topic:
             raise ValueError('Topic must be a non-empty string.')
         if not topic.startswith('/topics/'):
-            topic = '/topics/{0}'.format(topic)
+            topic = f'/topics/{topic}'
         data = {
             'to': topic,
             'registration_tokens': tokens,
         }
-        url = '{0}/{1}'.format(_MessagingServiceAsync.IID_URL, operation)
+        url = f'{_MessagingServiceAsync.IID_URL}/{operation}'
         try:
             resp = await self._client.body(
                 'post',
@@ -252,10 +252,10 @@ def _handle_iid_error(self, error: ClientResponseWithBodyError) -> FirebaseError
         code = data.get('error')
         msg = None
         if code:
-            msg = 'Error while calling the IID service: {0}'.format(code)
+            msg = f'Error while calling the IID service: {code}'
         else:
-            msg = 'Unexpected HTTP response with status: {0}; body: {1}'.format(
-                error.response.status_code, error.response.content.decode())
+            msg = (f'Unexpected HTTP response with status: {error.response.status_code}; '
+                   f'body: {error.response.content.decode()}')
 
         return _utils.handle_requests_error(error, msg)
 

tests/test_credentials.py

@@ -64,7 +64,7 @@ def test_init_from_invalid_certificate(self, file_name, error):
         with pytest.raises(error):
             credentials.Certificate(testutils.resource_filename(file_name))
 
-    @pytest.mark.parametrize('arg', [None, 0, 1, True, False, list(), tuple(), dict()])
+    @pytest.mark.parametrize('arg', [None, 0, 1, True, False, [], tuple(), {}])
     def test_invalid_args(self, arg):
         with pytest.raises(ValueError):
             credentials.Certificate(arg)
@@ -156,7 +156,7 @@ def test_init_from_invalid_file(self):
             credentials.RefreshToken(
                 testutils.resource_filename('service_account.json'))
 
-    @pytest.mark.parametrize('arg', [None, 0, 1, True, False, list(), tuple(), dict()])
+    @pytest.mark.parametrize('arg', [None, 0, 1, True, False, [], tuple(), {}])
     def test_invalid_args(self, arg):
         with pytest.raises(ValueError):
             credentials.RefreshToken(arg)