Support 2.7 types

Author: annatisch

azure/eventhub/async_ops/__init__.py

@@ -7,10 +7,7 @@
 import asyncio
 import time
 import datetime
-try:
-    from urllib import urlparse, unquote_plus, urlencode, quote_plus
-except ImportError:
-    from urllib.parse import urlparse, unquote_plus, urlencode, quote_plus
+from urllib.parse import urlparse, unquote_plus, urlencode, quote_plus
 
 from uamqp import authentication, constants, types, errors
 from uamqp import (

azure/eventhub/client.py

@@ -2,6 +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 __future__ import unicode_literals
 
 import logging
 import datetime
@@ -10,10 +11,12 @@
 import time
 import functools
 try:
-    from urllib import urlparse, unquote_plus, urlencode, quote_plus
+    from urlparse import urlparse
+    from urllib import unquote_plus, urlencode, quote_plus
 except ImportError:
     from urllib.parse import urlparse, unquote_plus, urlencode, quote_plus
 
+import six
 import uamqp
 from uamqp import Message
 from uamqp import authentication

azure/eventhub/common.py

@@ -2,11 +2,14 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
+from __future__ import unicode_literals
 
 import datetime
 import time
 import json
 
+import six
+
 from uamqp import Message, BatchMessage
 from uamqp import types, constants, errors
 from uamqp.message import MessageHeader, MessageProperties
@@ -63,6 +66,8 @@ def __init__(self, body=None, batch=None, to_device=None, message=None):
         :type body: str, bytes or list
         :param batch: A data generator to send batched messages.
         :type batch: Generator
+        :param to_device: An IoT device to route to.
+        :type to_device: str
         :param message: The received message.
         :type message: ~uamqp.message.Message
         """
@@ -94,7 +99,7 @@ def sequence_number(self):
         """
         The sequence number of the event data object.
 
-        :rtype: int
+        :rtype: int or long
         """
         return self._annotations.get(EventData.PROP_SEQ_NUMBER, None)
 
@@ -103,7 +108,7 @@ def offset(self):
         """
         The offset of the event data object.
 
-        :rtype: int
+        :rtype: ~azure.eventhub.common.Offset
         """
         try:
             return Offset(self._annotations[EventData.PROP_OFFSET].decode('UTF-8'))
@@ -200,13 +205,13 @@ def body_as_str(self, encoding='UTF-8'):
 
         :param encoding: The encoding to use for decoding message data.
          Default is 'UTF-8'
-        :rtype: str
+        :rtype: str or unicode
         """
         data = self.body
         try:
             return "".join(b.decode(encoding) for b in data)
         except TypeError:
-            return str(data)
+            return six.text_type(data)
         except:  # pylint: disable=bare-except
             pass
         try:
@@ -269,7 +274,7 @@ def selector(self):
         if isinstance(self.value, datetime.datetime):
             timestamp = (time.mktime(self.value.timetuple()) * 1000) + (self.value.microsecond/1000)
             return ("amqp.annotation.x-opt-enqueued-time {} '{}'".format(operator, int(timestamp))).encode('utf-8')
-        if isinstance(self.value, int):
+        if isinstance(self.value, six.integer_types):
             return ("amqp.annotation.x-opt-sequence-number {} '{}'".format(operator, self.value)).encode('utf-8')
         return ("amqp.annotation.x-opt-offset {} '{}'".format(operator, self.value)).encode('utf-8')
 
@@ -310,7 +315,7 @@ def __init__(self, message, details=None):
 
     def _parse_error(self, error_list):
         details = []
-        self.message = error_list if isinstance(error_list, str) else error_list.decode('UTF-8')
+        self.message = error_list if isinstance(error_list, six.text_types) else error_list.decode('UTF-8')
         details_index = self.message.find(" Reference:")
         if details_index >= 0:
             details_msg = self.message[details_index + 1:]

azure/eventhub/receiver.py

@@ -2,6 +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 __future__ import unicode_literals
 
 import uuid
 import logging
@@ -106,7 +107,7 @@ def reconnect(self):
         # pylint: disable=protected-access
         alt_creds = {
             "username": self.client._auth_config.get("iot_username"),
-            "password":self.client._auth_config.get("iot_password")}
+            "password": self.client._auth_config.get("iot_password")}
         self._handler.close()
         source = Source(self.source)
         if self.offset is not None:

azure/eventhub/sender.py

@@ -2,6 +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 __future__ import unicode_literals
 
 import uuid
 import logging