From 0cd5d71afaa5dc80921cfa65c4db788a3643f586 Mon Sep 17 00:00:00 2001 From: pjkersha Date: Fri, 15 Apr 2016 11:53:51 +0100 Subject: [PATCH 1/7] Moved license file into package, minor fix to utils open_url to fix kwargs to auth handler --- LICENSE => ndg/httpsclient/LICENSE | 0 ndg/httpsclient/utils.py | 4 ++-- setup.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) rename LICENSE => ndg/httpsclient/LICENSE (100%) diff --git a/LICENSE b/ndg/httpsclient/LICENSE similarity index 100% rename from LICENSE rename to ndg/httpsclient/LICENSE diff --git a/ndg/httpsclient/utils.py b/ndg/httpsclient/utils.py index a2b0ed3..d55d8f6 100644 --- a/ndg/httpsclient/utils.py +++ b/ndg/httpsclient/utils.py @@ -188,8 +188,8 @@ def open_url(url, config, data=None, handlers=None): # currently only supports http basic auth auth_handler = HTTPBasicAuthHandler_(HTTPPasswordMgrWithDefaultRealm_()) auth_handler.add_password(realm=None, uri=url, - user=config.httpauth[0], - passwd=config.httpauth[1]) + user=config.http_basicauth[0], + passwd=config.http_basicauth[1]) handlers.append(auth_handler) diff --git a/setup.py b/setup.py index d5a7419..edf0c2e 100644 --- a/setup.py +++ b/setup.py @@ -18,6 +18,7 @@ 0.4.1 ----- * Added explicit ref to Python 3 in classifier text for Python 3 checking tools. + * Moved LICENSE file into package 0.4.0 ----- @@ -121,6 +122,7 @@ # package_dir={'ndg.httpsclient': 'ndg/httpsclient'}, package_data={ 'ndg.httpsclient': [ + 'LICENSE', 'test/README', 'test/scripts/*.sh', 'test/pki/localhost.*', From 7a06245c0636ea8b7404428e8bb8971ecf8abc8f Mon Sep 17 00:00:00 2001 From: pjkersha Date: Fri, 15 Apr 2016 11:55:13 +0100 Subject: [PATCH 2/7] Update info about license file location. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index edf0c2e..ff5134e 100644 --- a/setup.py +++ b/setup.py @@ -116,7 +116,7 @@ author_email='Philip.Kershaw@stfc.ac.uk', url='https://github.com/cedadev/ndg_httpsclient/', long_description=_long_description, - license='BSD - See LICENCE file for details', + license='BSD - See ndg/httpsclient/LICENCE file for details', packages=find_packages(), namespace_packages=NAMESPACE_PKGS, # package_dir={'ndg.httpsclient': 'ndg/httpsclient'}, From 5e250bd1f84adfa921d7c03ed01dfcf9b240202f Mon Sep 17 00:00:00 2001 From: pjkersha Date: Fri, 15 Apr 2016 11:57:37 +0100 Subject: [PATCH 3/7] Added license info location change --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3018702..cdc68fc 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ Releases 0.4.1 ----- * Added explicit ref to Python 3 in classifier text for Python 3 checking tools. + * Moved LICENSE file into package 0.4.0 ----- From 0c9ee2ac2dab92c621627cf48c3cbd990e40b0f7 Mon Sep 17 00:00:00 2001 From: pjkersha Date: Fri, 15 Apr 2016 12:41:53 +0100 Subject: [PATCH 4/7] Updated pre-req info. --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index cdc68fc..dceb31b 100644 --- a/README.md +++ b/README.md @@ -31,13 +31,13 @@ Releases 0.3.1 ----- - * extended utils functions to support keyword for passing additional urllib2 + * extended utils functions to support keyword for passing additional ``urllib2`` handlers. 0.3.0 ----- - * Added ndg.httpsclient.utils.fetch_stream_from_url function and added - parameter for data to post in open_url and fetch_* methods. + * Added ``ndg.httpsclient.utils.fetch_stream_from_url`` function and added + parameter for data to post in ``open_url`` and ``fetch_*`` methods. * fix to ndg.httpsclient.utils module _should_use_proxy and open_url functions 0.2.0 @@ -51,10 +51,10 @@ Initial release Prerequisites ============= -This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13 and 0.14. -Version 0.4.0 tested with pyOpenSSL 0.15.1 and Python 2.7 and 3.4. Note that proxy support -is only available from Python 2.6.2 onwards. pyasn1 is required for correct SSL -verification with subjectAltNames. +This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13 +and 0.14. Version 0.4.0 tested with ``pyOpenSSL`` 0.15.1 and Python 2.7 and +3.4. Note that proxy support is only available from Python 2.6.2 onwards. +``pyasn1`` is required for correct SSL verification with ``subjectAltNames``. Installation ============ From b68bab3a7cf961a1d430fcb341cae136c89adbb6 Mon Sep 17 00:00:00 2001 From: pjkersha Date: Fri, 15 Apr 2016 12:50:12 +0100 Subject: [PATCH 5/7] Updating documentation ready for formal release of 0.4.1 --- README.md | 11 +++++++---- setup.py | 25 ++++++++++++++----------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index dceb31b..8aef73c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,10 @@ -A HTTPS client implementation for httplib and urllib2 based on -PyOpenSSL. PyOpenSSL provides a more fully featured SSL implementation over the -default provided with Python and importantly enables full verification of the -SSL peer. +A HTTPS client implementation for + * ``httplib`` (Python 2), ``http.client`` (Python 3) and + * ``urllib2`` (Python 2) and ``urllib`` (Python 3) + +... based on PyOpenSSL. PyOpenSSL provides a more fully featured SSL implementation +over the default provided with Python and importantly enables full verification +of the SSL peer using ``pyasn1``. Releases ======== diff --git a/setup.py b/setup.py index ff5134e..31a5f7b 100644 --- a/setup.py +++ b/setup.py @@ -8,10 +8,13 @@ NAMESPACE_PKGS = ['ndg'] _long_description = ''' -This is a HTTPS client implementation for httplib and urllib2 based on -PyOpenSSL. PyOpenSSL provides a more fully featured SSL implementation over the -default provided with Python and importantly enables full verification of the -SSL peer. +A HTTPS client implementation for + * ``httplib`` (Python 2), ``http.client`` (Python 3) and + * ``urllib2`` (Python 2) and ``urllib`` (Python 3) + +... based on PyOpenSSL. PyOpenSSL provides a more fully featured SSL implementation +over the default provided with Python and importantly enables full verification +of the SSL peer using ``pyasn1``. Releases ======== @@ -41,13 +44,13 @@ 0.3.1 ----- - * extended utils functions to support keyword for passing additional urllib2 + * extended utils functions to support keyword for passing additional ``urllib2`` handlers. 0.3.0 ----- - * Added ndg.httpsclient.utils.fetch_stream_from_url function and added - parameter for data to post in open_url and fetch_* methods. + * Added ``ndg.httpsclient.utils.fetch_stream_from_url`` function and added + parameter for data to post in ``open_url`` and ``fetch_*`` methods. * fix to ndg.httpsclient.utils module _should_use_proxy and open_url functions 0.2.0 @@ -61,10 +64,10 @@ Prerequisites ============= -This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13 and 0.14. -Version 0.4.0 tested with pyOpenSSL 0.15.1 and Python 2.7 and 3.4. Note that proxy support -is only available from Python 2.6.2 onwards. pyasn1 is required for correct SSL -verification with subjectAltNames. +This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13 +and 0.14. Version 0.4.0 tested with ``pyOpenSSL`` 0.15.1 and Python 2.7 and +3.4. Note that proxy support is only available from Python 2.6.2 onwards. +``pyasn1`` is required for correct SSL verification with ``subjectAltNames``. Installation ============ From a24ae9c58059142edef46cff5d78a2165be4fb63 Mon Sep 17 00:00:00 2001 From: pjkersha Date: Fri, 15 Apr 2016 13:28:42 +0100 Subject: [PATCH 6/7] updated dev status classifier --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 31a5f7b..86b6844 100644 --- a/setup.py +++ b/setup.py @@ -135,7 +135,7 @@ install_requires=['PyOpenSSL'], extras_require={'subjectAltName_support': 'pyasn1'}, classifiers=[ - 'Development Status :: 3 - Alpha', + 'Development Status :: 5 - Production/Stable', 'Environment :: Console', 'Environment :: Web Environment', 'Intended Audience :: End Users/Desktop', From cd5349e6b6c1ba6c4b4879d493e092bd9dbdb312 Mon Sep 17 00:00:00 2001 From: pjkersha Date: Mon, 6 Jun 2016 17:02:06 +0100 Subject: [PATCH 7/7] Preparing new PyPI release --- .pydevproject | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pydevproject b/.pydevproject index b26aeb6..5f4661d 100644 --- a/.pydevproject +++ b/.pydevproject @@ -1,6 +1,6 @@ -ndg-https-client-py3.4 +Default python 3.0 /ndg_httpsclient