Skip to content

Commit

Permalink
Replace sslv3 with sslv23 for TLS support
Browse files Browse the repository at this point in the history
  • Loading branch information
unknown authored and unknown committed Aug 21, 2015
1 parent 1fd6dca commit a3d33d8
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 12 deletions.
7 changes: 6 additions & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
Release History
---------------

9.3.4 (2015-08-20)
++++++++++++++++++

* Replace SSLv3 with SSLv23 for TLS support


9.3.3 (2015-07-31)
++++++++++++++++++

Expand All @@ -16,7 +22,6 @@ Release History
* Add App AdExtension support.
* Bug Fixes.


9.3.1 (2015-03-31)
++++++++++++++++++

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Bing Ads Python SDK

The Bing Ads Python Software Development Kit (SDK) Version 9.3 enhances the experience of developing Bing Ads applications
with the Python programming language.
The SDK uses the `suds-jurko`_ library as a proxy for all Bing Ads API web services and abstracts the low level details of authentication with OAuth.
The SDK includes proxy classes for all Bing Ads API web services and abstracts the low level details of authentication with OAuth.
You can also read and write bulk files with the SDK BulkFileReader and BulkFileWriter,
and use the high level BulkServiceManager interface to abstract and execute operations in the low level Bulk API.
For more information, see `Bing Ads Python SDK`_ on MSDN.
Expand Down
8 changes: 4 additions & 4 deletions bingads/bulk/bulk_operation.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
from requests.packages.urllib3.poolmanager import PoolManager


class Ssl3HttpAdapter(HTTPAdapter):
"""" Transport adapter" that allows us to use SSLv3. """
class Ssl23HttpAdapter(HTTPAdapter):
"""" Transport adapter" that allows us to use SSLv3 and TLS protocols """

def init_poolmanager(self, connections, maxsize, block=False):
self.poolmanager = PoolManager(
num_pools=connections,
maxsize=maxsize,
block=block,
ssl_version=ssl.PROTOCOL_SSLv3,
ssl_version=ssl.PROTOCOL_SSLv23,
)


Expand Down Expand Up @@ -91,7 +91,7 @@ def download_result_file(self, result_file_directory, result_file_name, decompre
'User-Agent': USER_AGENT,
}
s = requests.Session()
s.mount('https://', Ssl3HttpAdapter())
s.mount('https://', Ssl23HttpAdapter())
r = s.get(url, headers=headers, stream=True, verify=True)
r.raise_for_status()
try:
Expand Down
2 changes: 1 addition & 1 deletion bingads/bulk/bulk_service_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ def _upload_file_by_url(self, url, upload_file_path, compress_upload_file):

filename = '{0}{1}'.format(uuid.uuid1(), ext)
s = requests.Session()
s.mount('https://', Ssl3HttpAdapter())
s.mount('https://', Ssl23HttpAdapter())
r = s.post(url, files={'file': (filename, f)}, verify=True, headers=headers)
r.raise_for_status()
except Exception as ex:
Expand Down
2 changes: 1 addition & 1 deletion bingads/manifest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = '9.3.2'
VERSION = '9.3.4'
BULK_FORMAT_VERSION = '3.0'
WORKING_NAME = 'BingAdsSDKPython'
USER_AGENT = '{0} {1}'.format(WORKING_NAME, VERSION)
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Bing Ads Python SDK Reference Documentation
===========================================
Welcome to Bing Ads SDK's documentation!
========================================

.. toctree::
:maxdepth: 2
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
except ImportError:
from distutils.core import setup

VERSION = '9.3.3'
VERSION = '9.3.4'

with open('README.rst', 'r') as f:
readme = f.read()
Expand Down Expand Up @@ -43,7 +43,7 @@
zip_safe=False,
keywords='bingads',
classifiers=[
'Development Status :: 4 - Beta',
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
Expand Down

0 comments on commit a3d33d8

Please sign in to comment.