Remove unnecessary changes

Author: prabhakarjuzgar

opentelemetry-api/src/opentelemetry/context/__init__.py

@@ -41,8 +41,8 @@ def _load_runtime_context() -> _RuntimeContext:
 
     try:
         return next(  # type: ignore
-            iter(
-                entry_points(
+            iter(  # type: ignore
+                entry_points(  # type: ignore
                     group="opentelemetry_context",
                     name=configured_context,
                 )
@@ -55,8 +55,8 @@ def _load_runtime_context() -> _RuntimeContext:
             default_context,
         )
         return next(  # type: ignore
-            iter(
-                entry_points(
+            iter(  # type: ignore
+                entry_points(  # type: ignore
                     group="opentelemetry_context",
                     name=default_context,
                 )

opentelemetry-api/src/opentelemetry/propagate/__init__.py

@@ -136,8 +136,8 @@ def inject(
     try:
         propagators.append(  # type: ignore
             next(  # type: ignore
-                iter(
-                    entry_points(
+                iter(  # type: ignore
+                    entry_points(  # type: ignore
                         group="opentelemetry_propagator",
                         name=propagator,
                     )

opentelemetry-api/src/opentelemetry/util/_importlib_metadata.py

@@ -14,29 +14,16 @@
 
 # FIXME: Use importlib.metadata when support for 3.11 is dropped if the rest of
 # the supported versions at that time have the same API.
-try:
-    from importlib.metadata import (
-        Distribution,
-        EntryPoint,
-        EntryPoints,
-        PackageNotFoundError,
-        distributions,
-        entry_points,
-        requires,
-        version,
-    )
-except Exception:
-    from importlib_metadata import (
-        Distribution,
-        EntryPoint,
-        EntryPoints,
-        PackageNotFoundError,
-        distributions,
-        entry_points,
-        requires,
-        version,
-    )
-
+from importlib_metadata import (  # type: ignore
+    Distribution,
+    EntryPoint,
+    EntryPoints,
+    PackageNotFoundError,
+    distributions,
+    entry_points,
+    requires,
+    version,
+)
 
 __all__ = [
     "entry_points",

opentelemetry-sdk/src/opentelemetry/sdk/error_handler/__init__.py

@@ -116,7 +116,7 @@ def __exit__(self, exc_type, exc_value, traceback) -> Optional[bool]:  # type: i
 
         plugin_handled = False
 
-        error_handler_entry_points = entry_points(
+        error_handler_entry_points = entry_points(  # type: ignore
             group="opentelemetry_error_handler"
         )