revert

Author: hebaalazzeh

packages/google-api-core/google/api_core/exceptions.py

@@ -18,11 +18,12 @@
 on :mod:`google.api_core`, including both HTTP and gRPC clients.
 """
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import http.client
+from typing import Optional, Dict
 import warnings
-from typing import Dict, Optional
 
 from google.rpc import error_details_pb2
 
@@ -656,20 +657,9 @@ def from_grpc_error(rpc_exc):
         grpc is not None and isinstance(rpc_exc, grpc.Call)
     ) or _is_informative_grpc_error(rpc_exc):
         details, err_info = _parse_grpc_error_details(rpc_exc)
-        message = rpc_exc.details()
-        if (
-            grpc is not None
-            and rpc_exc.code() == grpc.StatusCode.UNIMPLEMENTED
-            and "Received http2 header with status: 404" in message
-        ):
-            message = (
-                f"{message}. This usually indicates that the 'api_endpoint' "
-                "configuration in ClientOptions is incorrect, contains a typo, "
-                "or is an invalid regional endpoint for this service."
-            )
         return from_grpc_status(
             rpc_exc.code(),
-            message,
+            rpc_exc.details(),
             errors=(rpc_exc,),
             details=details,
             response=rpc_exc,

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

@@ -12,14 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from google.api_core.gapic_v1 import (
-    client_info,
-    config,
-    config_async,
-    method,
-    method_async,
-    routing_header,
-)
+from google.api_core.gapic_v1 import client_info
+from google.api_core.gapic_v1 import config
+from google.api_core.gapic_v1 import config_async
+from google.api_core.gapic_v1 import method
+from google.api_core.gapic_v1 import method_async
+from google.api_core.gapic_v1 import routing_header
 
 __all__ = [
     "client_info",

packages/google-api-core/noxfile.py

@@ -350,7 +350,7 @@ def prerelease_deps(session):
 @nox.session(python=DEFAULT_PYTHON_VERSION)
 def core_deps_from_source(session):
     """Run the test suite installing dependencies from source."""
-    default(session, install_deps_from_source=True)
+    default(session, prerelease=True)
 
 
 @nox.session(python=DEFAULT_PYTHON_VERSION)

packages/google-api-core/tests/unit/test_bidi.py

@@ -31,7 +31,8 @@
 except ImportError:  # pragma: NO COVER
     pytest.skip("No GRPC", allow_module_level=True)
 
-from google.api_core import bidi, exceptions
+from google.api_core import bidi
+from google.api_core import exceptions
 
 
 class Test_RequestQueueGenerator(object):
@@ -194,7 +195,7 @@ def test_delays_entry_attempts_above_threshold(self):
         # (NOTE: not using assert all(...), b/c the coverage check would complain)
         for i, entry in enumerate(entries):
             if i != 3:
-                assert entry["reported_wait"] < 0.01
+                assert entry["reported_wait"] == 0.0
 
         # The delayed entry is expected to have been delayed for a significant
         # chunk of the full second, and the actual and reported delay times

packages/google-api-core/tests/unit/test_exceptions.py

@@ -25,11 +25,10 @@
 except ImportError:  # pragma: NO COVER
     grpc = rpc_status = None
 
+from google.api_core import exceptions
 from google.protobuf import any_pb2, json_format
 from google.rpc import error_details_pb2, status_pb2
 
-from google.api_core import exceptions
-
 
 def test_create_google_cloud_error():
     exception = exceptions.GoogleAPICallError("Testing")
@@ -394,18 +393,3 @@ def test_error_details_from_grpc_response_unknown_error():
         and exception.domain is None
         and exception.metadata is None
     )
-
-
-@pytest.mark.skipif(grpc is None, reason="No grpc")
-def test_from_grpc_error_misleading_404():
-    message = "Received http2 header with status: 404"
-    error = mock.create_autospec(grpc.Call, instance=True)
-    error.code.return_value = grpc.StatusCode.UNIMPLEMENTED
-    error.details.return_value = message
-
-    exception = exceptions.from_grpc_error(error)
-
-    assert isinstance(exception, exceptions.MethodNotImplemented)
-    assert exception.grpc_status_code == grpc.StatusCode.UNIMPLEMENTED
-    assert "Received http2 header with status: 404" in exception.message
-    assert "api_endpoint" in exception.message