remove unnecessary fmt skips

Author: ohmayr

gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/_shared_macros.j2

@@ -227,8 +227,7 @@ def _get_http_options():
         request_url = "{host}{uri}".format(host=self._host, uri=transcoded_request['uri'])
         method = transcoded_request['method']
         {# TODO(https://github.com/googleapis/gapic-generator-python/issues/2137): Remove `type:  ignore` once version check is added for google-api-core. #}
-        {# Add `# fmt: skip` to keep `# type: ignore` on the same line #}
-        raise core_exceptions.format_http_response_error(response, method, request_url, payload)  # type: ignore # fmt: skip
+        raise core_exceptions.format_http_response_error(response, method, request_url, payload)  # type: ignore
         {% else %}
         raise core_exceptions.from_http_response(response)
         {% endif %}{# is_async #}

gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/client.py.j2

@@ -131,8 +131,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
 
     DEFAULT_ENDPOINT = {% if service.host %}"{{ service.host }}"{% else %}None{% endif %}
 
-    {# Add `# fmt: skip` to keep `# type: ignore` on the same line #}
-    DEFAULT_MTLS_ENDPOINT = _get_default_mtls_endpoint.__func__(  # type: ignore # fmt: skip
+    DEFAULT_MTLS_ENDPOINT = _get_default_mtls_endpoint.__func__(  # type: ignore
         DEFAULT_ENDPOINT
     )
 

gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/rest.py.j2

@@ -273,8 +273,7 @@ class {{service.name}}RestTransport(_Base{{ service.name }}RestTransport):
             {{method.output.ident}}]:
         # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here.
         # In C++ this would require a dynamic_cast
-        {# Add `# fmt: skip` to keep `# type: ignore` on the same line #}
-        return self._{{method.name}}(self._session, self._host, self._interceptor) # type: ignore # fmt: skip
+        return self._{{method.name}}(self._session, self._host, self._interceptor) # type: ignore
 
     {% endfor %}
 

gapic/templates/%namespace/%name_%version/%sub/services/%service/_shared_macros.j2

@@ -257,8 +257,7 @@ def _get_http_options():
         request_url = "{host}{uri}".format(host=self._host, uri=transcoded_request['uri'])
         method = transcoded_request['method']
         {# TODO(https://github.com/googleapis/gapic-generator-python/issues/2137): Remove `type:  ignore` once version check is added for google-api-core. #}
-        {# Add `# fmt: skip` to keep `# type: ignore` on the same line #}
-        raise core_exceptions.format_http_response_error(response, method, request_url, payload)  # type: ignore # fmt: skip
+        raise core_exceptions.format_http_response_error(response, method, request_url, payload)  # type: ignore
         {% else %}
         raise core_exceptions.from_http_response(response)
         {% endif %}{# is_async #}
@@ -490,8 +489,7 @@ class {{ async_method_name_prefix }}{{ service.name }}RestInterceptor:
 
 @property
 def {{ name|snake_case }}(self):
-    {# Add `# fmt: skip` to keep `# type: ignore` on the same line #}
-    return self.{{ name|make_private }}(self._session, self._host, self._interceptor) # type: ignore # fmt: skip
+    return self.{{ name|make_private }}(self._session, self._host, self._interceptor) # type: ignore
 
 class {{ name|make_private }}(_Base{{ service.name }}RestTransport._Base{{name}}, {{ async_method_name_prefix }}{{service.name}}RestStub):
     def __hash__(self):

gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2

@@ -152,8 +152,7 @@ class {{ service.async_client_name }}:
         Raises:
             google.auth.exceptions.MutualTLSChannelError: If any errors happen.
         """
-        {# Add `# fmt: skip` to keep `# type: ignore` on the same line #}
-        return {{ service.client_name }}.get_mtls_endpoint_and_cert_source(client_options)  # type: ignore # fmt: skip
+        return {{ service.client_name }}.get_mtls_endpoint_and_cert_source(client_options)  # type: ignore
 
     @property
     def transport(self) -> {{ service.name }}Transport:

gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2

@@ -175,8 +175,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
     # Note: DEFAULT_ENDPOINT is deprecated. Use _DEFAULT_ENDPOINT_TEMPLATE instead.
     DEFAULT_ENDPOINT = {% if service.host %}"{{ service.host }}"{% else %}None{% endif %}
 
-    {# Add `# fmt: skip` to keep `# type: ignore` on the same line #}
-    DEFAULT_MTLS_ENDPOINT = _get_default_mtls_endpoint.__func__(  # type: ignore # fmt: skip
+    DEFAULT_MTLS_ENDPOINT = _get_default_mtls_endpoint.__func__(  # type: ignore
         DEFAULT_ENDPOINT
     )
 

gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2

@@ -311,8 +311,7 @@ class {{service.name}}RestTransport(_Base{{ service.name }}RestTransport):
             {{method.output.ident}}]:
         # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here.
         # In C++ this would require a dynamic_cast
-        {# Add `# fmt: skip` to keep `# type: ignore` on the same line #}
-        return self._{{method.name}}(self._session, self._host, self._interceptor) # type: ignore # fmt: skip
+        return self._{{method.name}}(self._session, self._host, self._interceptor) # type: ignore
 
     {% endfor %}
 

gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest_asyncio.py.j2

@@ -318,8 +318,7 @@ class Async{{service.name}}RestTransport(_Base{{ service.name }}RestTransport):
     def {{method.transport_safe_name|snake_case}}(self) -> Callable[
             [{{method.input.ident}}],
             {{method.output.ident}}]:
-        {# Add `# fmt: skip` to keep `# type: ignore` on the same line #}
-        return self._{{method.name}}(self._session, self._host, self._interceptor)  # type: ignore # fmt: skip
+        return self._{{method.name}}(self._session, self._host, self._interceptor)  # type: ignore
 
     {% endfor %}
     {% for name, sig in api.mixin_api_signatures.items() %} 

gapic/templates/tests/unit/gapic/%name_%version/%sub/test_macros.j2

@@ -1635,8 +1635,7 @@ def test_unsupported_parameter_rest_asyncio():
         pytest.skip("the library must be installed with the `async_rest` extra to test this feature.")
     options = client_options.ClientOptions(quota_project_id="octopus")
     {# TODO(https://github.com/googleapis/gapic-generator-python/issues/2137): Remove `type: ignore` once we add a version check for google-api-core. #}
-    {# Add `# fmt: skip` to keep `# type: ignore` on the same line #}
-    with pytest.raises(core_exceptions.AsyncRestUnsupportedParameterError, match="google.api_core.client_options.ClientOptions.quota_project_id") as exc:  # type: ignore # fmt: skip
+    with pytest.raises(core_exceptions.AsyncRestUnsupportedParameterError, match="google.api_core.client_options.ClientOptions.quota_project_id") as exc:  # type: ignore
         client = {{ get_client(service, True) }}(
             credentials={{get_credentials(True)}},
             transport="rest_asyncio",