fix lint/formatting issues and resolve stray conflict markers in gapic_v1/__init__.py

Author: hebaalazzeh

packages/google-api-core/google/api_core/gapic_v1/__init__.py

@@ -25,16 +25,11 @@
 # Older Python versions safely ignore this variable.
 __lazy_modules__: Set[str] = {
     "google.api_core.gapic_v1.client_info",
-
     "google.api_core.gapic_v1.client_utils",
-    "google.api_core.gapic_v1.routing_header",
-}
-__all__ = ["client_info", "client_utils", "routing_header"]
-=======
     "google.api_core.gapic_v1.requests",
     "google.api_core.gapic_v1.routing_header",
 }
-__all__ = ["client_info", "requests", "routing_header"]
+__all__ = ["client_info", "client_utils", "requests", "routing_header"]
 
 
 if _has_grpc:
@@ -51,7 +46,6 @@
     client_info,
     client_utils,
     requests,
-
     routing_header,
 )
 

packages/google-api-core/google/api_core/gapic_v1/requests.py

@@ -21,8 +21,8 @@
 if they are not already set.
 """
 
-from typing import Union
 import uuid
+from typing import Union
 
 import google.protobuf.message
 

packages/google-api-core/tests/unit/gapic/test_client_utils.py

@@ -16,13 +16,13 @@
 from unittest import mock
 
 import pytest
+from google.auth.exceptions import MutualTLSChannelError
 
 from google.api_core.gapic_v1.client_utils import (
     get_api_endpoint,
     get_default_mtls_endpoint,
     get_universe_domain,
 )
-from google.auth.exceptions import MutualTLSChannelError
 
 
 class MockClient:
@@ -188,7 +188,6 @@ def test_get_api_endpoint(
         )
 
 
-
 def test__get_universe_domain():
     client_universe_domain = "foo.com"
     universe_domain_env = "bar.com"

packages/google-api-core/tests/unit/gapic/test_requests.py

@@ -19,7 +19,6 @@
 
 from google.api_core.gapic_v1.requests import setup_request_id
 
-
 # --- Mock Request Helper Classes ---