Make protocol string case insensitive

Ubuntu · Ubuntu · commit 90b27d5fb368 · 2015-06-05T13:19:11.000Z
diff --git a/azure/http/httpclient.py b/azure/http/httpclient.py
@@ -126,13 +126,15 @@ def get_uri(self, request):
         ''' Return the target uri for the request.'''
         protocol = request.protocol_override \
             if request.protocol_override else self.protocol
+        protocol = protocol.lower()
         port = HTTP_PORT if protocol == 'http' else HTTPS_PORT
         return protocol + '://' + request.host + ':' + str(port) + request.path
 
     def get_connection(self, request):
         ''' Create connection for the request. '''
         protocol = request.protocol_override \
             if request.protocol_override else self.protocol
+        protocol = protocol.lower()
         target_host = request.host
         target_port = HTTP_PORT if protocol == 'http' else HTTPS_PORT
 
@@ -159,7 +161,7 @@ def get_connection(self, request):
                 host = target_host
                 port = target_port
 
-            if protocol == 'http':
+            if protocol.lower() == 'http':
                 connection = HTTPConnection(host, int(port),
                                             timeout=self.timeout)
             else:
diff --git a/azure/http/winhttp.py b/azure/http/winhttp.py
@@ -396,7 +396,7 @@ def __init__(self, host, cert_file, protocol, timeout):
         self.host = unicode(host)
         self.cert_file = cert_file
         self._httprequest = _WinHttpRequest()
-        self.protocol = protocol
+        self.protocol = protocol.lower()
         self.timeout = timeout
         clsid = GUID('{2087C2F4-2CEF-4953-A8AB-66779B670495}')
         iid = GUID('{016FE2EC-B2C8-45F8-B23B-39E53A75396B}')
diff --git a/azure/storage/__init__.py b/azure/storage/__init__.py
@@ -1297,7 +1297,7 @@ def __init__(self, connection_string = ''):
 
         self.account_name = connection_params.get('AccountName', None)
         self.account_key = connection_params.get('AccountKey', None)
-        self.protocol = connection_params.get('DefaultEndpointsProtocol', 'https')
+        self.protocol = connection_params.get('DefaultEndpointsProtocol', 'https').lower()
         endpoint_suffix = connection_params.get('EndpointSuffix', None)
         self.host_base_blob = BLOB_SERVICE_HOST_BASE if endpoint_suffix is None \
                               else ".blob.{}".format(endpoint_suffix)
diff --git a/azure/storage/blobservice.py b/azure/storage/blobservice.py
@@ -114,7 +114,7 @@ def __init__(self, account_name=None, account_key=None, protocol='https',
             connection_params = StorageConnectionParameters(connection_string)
             account_name = connection_params.account_name
             account_key = connection_params.account_key
-            protocol = connection_params.protocol
+            protocol = connection_params.protocol.lower()
             host_base = connection_params.host_base_blob
             
         self._BLOB_MAX_DATA_SIZE = 64 * 1024 * 1024
diff --git a/azure/storage/queueservice.py b/azure/storage/queueservice.py
@@ -95,7 +95,7 @@ def __init__(self, account_name=None, account_key=None, protocol='https',
             connection_params = StorageConnectionParameters(connection_string)
             account_name = connection_params.account_name
             account_key = connection_params.account_key
-            protocol = connection_params.protocol
+            protocol = connection_params.protocol.lower()
             host_base = connection_params.host_base_queue
             
         super(QueueService, self).__init__(
diff --git a/azure/storage/storageclient.py b/azure/storage/storageclient.py
@@ -64,7 +64,7 @@ def __init__(self, account_name=None, account_key=None, protocol='https',
         self.account_name = account_name
         self.account_key = account_key
         self.requestid = None
-        self.protocol = protocol
+        self.protocol = protocol.lower()
         self.host_base = host_base
         self.dev_host = dev_host
         self.sas_token = sas_token
diff --git a/azure/storage/tableservice.py b/azure/storage/tableservice.py
@@ -93,7 +93,7 @@ def __init__(self, account_name=None, account_key=None, protocol='https',
             connection_params = StorageConnectionParameters(connection_string)
             account_name = connection_params.account_name
             account_key = connection_params.account_key
-            protocol = connection_params.protocol
+            protocol = connection_params.protocol.lower()
             host_base = connection_params.host_base_table
             
         super(TableService, self).__init__(
