[EventHub] l0lawrence's fix import (Azure#34269)

* fixes

* drop 3.7

* had to switch

* fix typing for exception

---------

Co-authored-by: Libba Lawrence <[email protected]>

Author: 2 people

sdk/eventhub/azure-eventhub/CHANGELOG.md

@@ -1,14 +1,9 @@
 # Release History
 
-## 5.11.6 (Unreleased)
+## 5.11.6 (2024-02-12)
 
 ### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+- Added `keep_alive` functionality on EventHubProducerClient to allow for long-living producers. [#33726](https://github.com/Azure/azure-sdk-for-python/issues/33726)
 
 ## 5.11.5 (2023-11-13)
 

sdk/eventhub/azure-eventhub/azure/eventhub/_transport/_pyamqp_transport.py

@@ -676,7 +676,8 @@ def _handle_exception(
         #     raise error
         elif isinstance(exception, errors.MessageException):
             _LOGGER.info("%r Event data send error (%r)", name, exception)
-            error = EventDataSendError(str(exception), exception)
+            # TODO: issue #34266
+            error = EventDataSendError(str(exception), exception)   # type: ignore[arg-type]
             raise error
         else:
             if isinstance(exception, errors.AuthenticationException):

sdk/eventhub/azure-eventhub/azure/eventhub/aio/_transport/_pyamqp_transport_async.py

@@ -376,7 +376,8 @@ async def _handle_exception_async(  # pylint:disable=too-many-branches, too-many
         #     raise error
         elif isinstance(exception, errors.MessageException):
             _LOGGER.info("%r Event data send error (%r)", name, exception)
-            error = EventDataSendError(str(exception), exception)
+            # TODO: issue #34266
+            error = EventDataSendError(str(exception), exception)   # type: ignore[arg-type]
             raise error
         else:
             try:

sdk/eventhub/azure-eventhub/azure/eventhub/exceptions.py

@@ -2,11 +2,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
-from typing import Union, List, Optional, cast, TYPE_CHECKING
-from ._pyamqp.error import AMQPException
-
-if TYPE_CHECKING:
-    from ._pyamqp.error import ErrorCondition
+from typing import Union, List, Optional
 
 
 class EventHubError(Exception):
@@ -18,36 +14,31 @@ class EventHubError(Exception):
     :vartype error: str
     :ivar details: The error details, if included in the
      service response.
-    :vartype details: list[str] or AMQPException
+    :vartype details: list[str]
     """
 
-    def __init__(self, message: str, details: Optional[Union[List[str], "AMQPException"]] = None) -> None:
+    def __init__(self, message: str, details: Optional[List[str]] = None) -> None:
         self.error: Optional[str] = None
         self.message: str = message
-        self.details: Union[List[str], "AMQPException"]
+        self.details: Union[List[str]]
         if details and isinstance(details, Exception):
-            self.details = details
-            if isinstance(self.details, AMQPException):
+            # TODO: issue #34266
+            try:
+                condition = details.condition.value.decode("UTF-8") # type: ignore[attr-defined]
+            except AttributeError:
                 try:
-                    details.condition = cast("ErrorCondition", details.condition)
-                    condition = details.condition.value.decode("UTF-8")
+                    condition = details.condition.decode("UTF-8") # type: ignore[attr-defined]
                 except AttributeError:
-                    try:
-                        details.condition = cast(bytes, details.condition)
-                        condition = details.condition.decode("UTF-8")
-                    except AttributeError:
-                        condition = None
-                if condition:
-                    _, _, self.error = condition.partition(":")
-                    self.message += "\nError: {}".format(self.error)
-            elif isinstance(self.details, list):
-                try:
-                    details.description = cast(str, details.description)
-                    self._parse_error(details.description)
-                    for detail in self.details:
-                        self.message += "\n{}".format(detail)
-                except:  # pylint: disable=bare-except
-                    self.message += "\n{}".format(details)
+                    condition = None
+            if condition:
+                _, _, self.error = condition.partition(":")
+                self.message += "\nError: {}".format(self.error)
+            try:
+                self._parse_error(details.description) # type: ignore[attr-defined]
+                for detail in self.details:
+                    self.message += "\n{}".format(detail)
+            except:  # pylint: disable=bare-except
+                self.message += "\n{}".format(details)
         super(EventHubError, self).__init__(self.message)
 
     def _parse_error(self, error_list: Union[str, bytes]) -> None:

sdk/eventhub/azure-eventhub/setup.py

@@ -59,14 +59,13 @@
         "Development Status :: 5 - Production/Stable",
         'Programming Language :: Python',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'License :: OSI Approved :: MIT License',
     ],
-    python_requires=">=3.7",
+    python_requires=">=3.8",
     zip_safe=False,
     packages=find_packages(exclude=exclude_packages),
     install_requires=[