Merge pull request Azure#385 from huguesv/0_11_1

Hugues Valois · Hugues Valois · commit f2e1bdd417d5 · 2015-06-16T15:46:01.000-07:00
0.11.1
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,15 @@
+2015-06-16 Version 0.11.1
+
+ * Azure storage connection string support
+ * Add a request_session parameter to storage and service bus classes
+ * Fixes for bugs:
+   #370 Fix table service authentication for non-english locale
+   #380 Make protocol string case insensitive
+   #376 Make pyopenssl dependency optional
+   #360 Installing `azure` on Python 3 should not install futures
+
+Thank you to rchamorro, drdarshan, hosungs, h_yamaki for their contributions.
+
 2015-05-13 Version 0.11.0
 
 IMPORTANT CHANGE THAT AFFECTS STORAGE:
diff --git a/azure/__init__.py b/azure/__init__.py
@@ -1,4 +1,4 @@
-#-------------------------------------------------------------------------
+﻿#-------------------------------------------------------------------------
 # Copyright (c) Microsoft.  All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +43,7 @@
 # constants
 
 __author__ = 'Microsoft Corp. <ptvshelp@microsoft.com>'
-__version__ = '0.11.0'
+__version__ = '0.11.1'
 
 # Live ServiceClient URLs
 BLOB_SERVICE_HOST_BASE = '.blob.core.windows.net'
diff --git a/azure/servicebus/servicebusservice.py b/azure/servicebus/servicebusservice.py
@@ -1,4 +1,4 @@
-#-------------------------------------------------------------------------
+﻿#-------------------------------------------------------------------------
 # Copyright (c) Microsoft.  All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -68,7 +68,8 @@ class ServiceBusService(object):
     def __init__(self, service_namespace=None, account_key=None, issuer=None,
                  x_ms_version='2011-06-01', host_base=SERVICE_BUS_HOST_BASE,
                  shared_access_key_name=None, shared_access_key_value=None,
-                 authentication=None, timeout=DEFAULT_HTTP_TIMEOUT):
+                 authentication=None, timeout=DEFAULT_HTTP_TIMEOUT,
+                 request_session=None):
         '''
         Initializes the service bus service for a namespace with the specified
         authentication settings (SAS or ACS).
@@ -100,6 +101,9 @@ def __init__(self, service_namespace=None, account_key=None, issuer=None,
             ACS and SAS parameters are ignored.
         timeout:
             Optional. Timeout for the http request, in seconds.
+        request_session:
+            Optional. Session object to use for http requests. If this is
+            specified, it replaces the default use of httplib.
         '''
         self.requestid = None
         self.service_namespace = service_namespace
@@ -131,7 +135,11 @@ def __init__(self, service_namespace=None, account_key=None, issuer=None,
                 raise WindowsAzureError(
                     'You need to provide servicebus access key and Issuer OR shared access key and value')
 
-        self._httpclient = _HTTPClient(service_instance=self, timeout=timeout)
+        self._httpclient = _HTTPClient(
+            service_instance=self,
+            timeout=timeout,
+            request_session=request_session,
+        )
         self._filter = self._httpclient.perform_request
 
     # Backwards compatibility:
diff --git a/azure/storage/blobservice.py b/azure/storage/blobservice.py
@@ -1,4 +1,4 @@
-#-------------------------------------------------------------------------
+﻿#-------------------------------------------------------------------------
 # Copyright (c) Microsoft.  All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -84,7 +84,8 @@ class BlobService(_StorageClient):
 
     def __init__(self, account_name=None, account_key=None, protocol='https',
                  host_base=BLOB_SERVICE_HOST_BASE, dev_host=DEV_BLOB_HOST,
-                 timeout=DEFAULT_HTTP_TIMEOUT, sas_token=None, connection_string=None):
+                 timeout=DEFAULT_HTTP_TIMEOUT, sas_token=None, connection_string=None,
+                 request_session=None):
         '''
         account_name:
             your storage account name, required for all operations.
@@ -109,6 +110,9 @@ def __init__(self, account_name=None, account_key=None, protocol='https',
             connection_string. See 
             http://azure.microsoft.com/en-us/documentation/articles/storage-configure-connection-string/
             for the connection string format.
+        request_session:
+            Optional. Session object to use for http requests. If this is
+            specified, it replaces the default use of httplib.
         '''
         if connection_string is not None:
             connection_params = StorageConnectionParameters(connection_string)
@@ -120,7 +124,7 @@ def __init__(self, account_name=None, account_key=None, protocol='https',
         self._BLOB_MAX_DATA_SIZE = 64 * 1024 * 1024
         self._BLOB_MAX_CHUNK_DATA_SIZE = 4 * 1024 * 1024
         super(BlobService, self).__init__(
-            account_name, account_key, protocol, host_base, dev_host, timeout, sas_token)
+            account_name, account_key, protocol, host_base, dev_host, timeout, sas_token, request_session)
 
         if self.account_key:
             self.authentication = StorageSharedKeyAuthentication(
diff --git a/azure/storage/queueservice.py b/azure/storage/queueservice.py
@@ -1,4 +1,4 @@
-#-------------------------------------------------------------------------
+﻿#-------------------------------------------------------------------------
 # Copyright (c) Microsoft.  All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -65,7 +65,8 @@ class QueueService(_StorageClient):
 
     def __init__(self, account_name=None, account_key=None, protocol='https',
                  host_base=QUEUE_SERVICE_HOST_BASE, dev_host=DEV_QUEUE_HOST,
-                 timeout=DEFAULT_HTTP_TIMEOUT, sas_token=None, connection_string=None):
+                 timeout=DEFAULT_HTTP_TIMEOUT, sas_token=None, connection_string=None,
+                 request_session=None):
         '''
         account_name:
             your storage account name, required for all operations.
@@ -90,6 +91,9 @@ def __init__(self, account_name=None, account_key=None, protocol='https',
             connection_string. See 
             http://azure.microsoft.com/en-us/documentation/articles/storage-configure-connection-string/
             for the connection string format.
+        request_session:
+            Optional. Session object to use for http requests. If this is
+            specified, it replaces the default use of httplib.
         '''
         if connection_string is not None:
             connection_params = StorageConnectionParameters(connection_string)
@@ -99,7 +103,7 @@ def __init__(self, account_name=None, account_key=None, protocol='https',
             host_base = connection_params.host_base_queue
             
         super(QueueService, self).__init__(
-            account_name, account_key, protocol, host_base, dev_host, timeout, sas_token)
+            account_name, account_key, protocol, host_base, dev_host, timeout, sas_token, request_session)
 
         if self.account_key:
             self.authentication = StorageSharedKeyAuthentication(
diff --git a/azure/storage/storageclient.py b/azure/storage/storageclient.py
@@ -1,4 +1,4 @@
-#-------------------------------------------------------------------------
+﻿#-------------------------------------------------------------------------
 # Copyright (c) Microsoft.  All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +43,7 @@ class _StorageClient(object):
 
     def __init__(self, account_name=None, account_key=None, protocol='https',
                  host_base='', dev_host='', timeout=DEFAULT_HTTP_TIMEOUT,
-                 sas_token=None):
+                 sas_token=None, request_session=None):
         '''
         account_name:
             your storage account name, required for all operations.
@@ -60,6 +60,9 @@ def __init__(self, account_name=None, account_key=None, protocol='https',
             Optional. Timeout for the http request, in seconds.
         sas_token:
             Optional. Token to use to authenticate with shared access signature.
+        request_session:
+            Optional. Session object to use for http requests. If this is
+            specified, it replaces the default use of httplib.
         '''
         self.account_name = account_name
         self.account_key = account_key
@@ -99,7 +102,9 @@ def __init__(self, account_name=None, account_key=None, protocol='https',
         self._httpclient = _HTTPClient(
             service_instance=self,
             protocol=self.protocol,
-            timeout=timeout)
+            timeout=timeout,
+            request_session=request_session,
+        )
         self._batchclient = None
         self._filter = self._perform_request_worker
 
diff --git a/azure/storage/tableservice.py b/azure/storage/tableservice.py
@@ -1,4 +1,4 @@
-#-------------------------------------------------------------------------
+﻿#-------------------------------------------------------------------------
 # Copyright (c) Microsoft.  All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -63,7 +63,8 @@ class TableService(_StorageClient):
 
     def __init__(self, account_name=None, account_key=None, protocol='https',
                  host_base=TABLE_SERVICE_HOST_BASE, dev_host=DEV_TABLE_HOST,
-                 timeout=DEFAULT_HTTP_TIMEOUT, sas_token=None, connection_string=None):
+                 timeout=DEFAULT_HTTP_TIMEOUT, sas_token=None, connection_string=None,
+                 request_session=None):
         '''
         account_name:
             your storage account name, required for all operations.
@@ -88,6 +89,9 @@ def __init__(self, account_name=None, account_key=None, protocol='https',
             connection_string. See
             http://azure.microsoft.com/en-us/documentation/articles/storage-configure-connection-string/
             for the connection string format.
+        request_session:
+            Optional. Session object to use for http requests. If this is
+            specified, it replaces the default use of httplib.
         '''
         if connection_string is not None:
             connection_params = StorageConnectionParameters(connection_string)
@@ -97,7 +101,7 @@ def __init__(self, account_name=None, account_key=None, protocol='https',
             host_base = connection_params.host_base_table
             
         super(TableService, self).__init__(
-            account_name, account_key, protocol, host_base, dev_host, timeout, sas_token)
+            account_name, account_key, protocol, host_base, dev_host, timeout, sas_token, request_session)
 
         if self.account_key:
             self.authentication = StorageTableSharedKeyAuthentication(
diff --git a/doc/conf.py b/doc/conf.py
@@ -53,9 +53,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.11.0'
+version = '0.11.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.11.0'
+release = '0.11.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+﻿#!/usr/bin/env python
 
 #-------------------------------------------------------------------------
 # Copyright (c) Microsoft.  All rights reserved.
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-
+import sys
 from distutils.core import setup
 
 # To build:
@@ -29,8 +29,12 @@
 # To upload:
 # python setup.py sdist upload
 
+reqs = ['python-dateutil']
+if sys.version_info < (3,0):
+    reqs.append('futures')
+
 setup(name='azure',
-      version='0.11.0',
+      version='0.11.1',
       description='Microsoft Azure client APIs',
       long_description=open('README.rst', 'r').read(),
       license='Apache License 2.0',
@@ -51,8 +55,7 @@
                 'azure.servicebus',
                 'azure.storage',
                 'azure.servicemanagement'],
-      install_requires=['python-dateutil', 
-                        'futures'],
+      install_requires=reqs,
       extras_require = { 
           'get_certificate_from_publish_settings' : ['pyopenssl'] 
       }
diff --git a/tests/test_blobservice.py b/tests/test_blobservice.py
@@ -64,6 +64,7 @@
 from util import (
     AzureTestCase,
     credentials,
+    create_storage_service,
     getUniqueName,
     set_service_options,
     )
@@ -75,16 +76,20 @@
 class BlobServiceTest(AzureTestCase):
 
     def setUp(self):
-        self.bs = BlobService(credentials.getStorageServicesName(),
-                              credentials.getStorageServicesKey())
-        set_service_options(self.bs)
+        self.bs = create_storage_service(
+            BlobService,
+            credentials.getStorageServicesName(),
+            credentials.getStorageServicesKey(),
+        )
 
         remote_storage_service_name = credentials.getRemoteStorageServicesName()
         remote_storage_service_key = credentials.getRemoteStorageServicesKey()
         if remote_storage_service_key and remote_storage_service_name:
-            self.bs2 = BlobService(credentials.getRemoteStorageServicesName(),
-                                   credentials.getRemoteStorageServicesKey())
-            set_service_options(self.bs2)
+            self.bs2 = create_storage_service(
+                BlobService,
+                remote_storage_service_name,
+                remote_storage_service_key,
+            )
         else:
             print("Remote Storage Account not configured. Add " \
                   "'remotestorageserviceskey' and 'remotestorageservicesname'" \
diff --git a/tests/test_eventhubservice.py b/tests/test_eventhubservice.py
@@ -42,11 +42,17 @@
 class EventHubServiceTest(AzureTestCase):
 
     def setUp(self):
+        session = None
+        if credentials.getUseRequestsLibrary():
+            from requests import Session
+            session = Session()
+
         self.sbs = ServiceBusService(
             credentials.getEventHubNamespace(),
             shared_access_key_name=credentials.getEventHubSasKeyName(),
             shared_access_key_value=credentials.getEventHubSasKeyValue(),
-            )
+            request_session=session,
+        )
 
         set_service_options(self.sbs)
 
diff --git a/tests/test_queueservice.py b/tests/test_queueservice.py
@@ -30,6 +30,7 @@
     AzureTestCase,
     credentials,
     getUniqueName,
+    create_storage_service,
     set_service_options,
 )
 
@@ -41,9 +42,11 @@
 class QueueServiceTest(AzureTestCase):
 
     def setUp(self):
-        self.qs = QueueService(credentials.getStorageServicesName(),
-                               credentials.getStorageServicesKey())
-        set_service_options(self.qs)
+        self.qs = create_storage_service(
+            QueueService,
+            credentials.getStorageServicesName(),
+            credentials.getStorageServicesKey(),
+        )
 
         self.test_queues = []
         self.creatable_queues = []
diff --git a/tests/test_servicebusservice.py b/tests/test_servicebusservice.py
@@ -48,17 +48,25 @@
 class ServiceBusTest(AzureTestCase):
 
     def setUp(self):
+        session = None
+        if credentials.getUseRequestsLibrary():
+            from requests import Session
+            session = Session()
+
         if credentials.getServiceBusAuthenticationType().lower() == 'sas':
             self.sbs = ServiceBusService(
                 credentials.getServiceBusNamespace(),
                 shared_access_key_name=credentials.getServiceBusSasKeyName(),
                 shared_access_key_value=credentials.getServiceBusSasKeyValue(),
-                )
+                request_session=session,
+            )
         else:
             self.sbs = ServiceBusService(
                 credentials.getServiceBusNamespace(),
                 account_key=credentials.getServiceBusKey(),
-                issuer='owner')
+                issuer='owner',
+                request_session=session,
+            )
 
         set_service_options(self.sbs)
 
diff --git a/tests/test_tableservice.py b/tests/test_tableservice.py
@@ -42,6 +42,7 @@
 from util import (
     AzureTestCase,
     credentials,
+    create_storage_service,
     getUniqueName,
     set_service_options,
 )
@@ -55,9 +56,11 @@
 class TableServiceTest(AzureTestCase):
 
     def setUp(self):
-        self.ts = TableService(credentials.getStorageServicesName(),
-                               credentials.getStorageServicesKey())
-        set_service_options(self.ts)
+        self.ts = create_storage_service(
+            TableService,
+            credentials.getStorageServicesName(),
+            credentials.getStorageServicesKey(),
+        )
 
         self.table_name = getUniqueName('uttable')
         self.additional_table_names = []
diff --git a/tests/util.py b/tests/util.py
