Skip to content

Commit 1e8ae88

Browse files
author
pjkersha
committed
== 0.3.1 Release ==
Release for Contrail project * added urllib2 handlers keyword for utils functions. git-svn-id: http://proj.badc.rl.ac.uk/svn/ndg-security/trunk/ndg_httpsclient@8149 051b1e3e-aa0c-0410-b6c2-bfbade6052be
1 parent 4098cee commit 1e8ae88

File tree

1 file changed

+45
-27
lines changed

1 file changed

+45
-27
lines changed

setup.py

Lines changed: 45 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,65 +6,83 @@
66
from setuptools import setup, find_packages
77

88
_long_description = '''
9-
This is a HTTPS client implementation for httplib and urllib2 based on
9+
This is a HTTPS client implementation for httplib and urllib2 based on
1010
PyOpenSSL. PyOpenSSL provides a more fully featured SSL implementation over the
1111
default provided with Python and importantly enables full verification of the
12-
SSL peer.
12+
SSL peer.
1313
1414
Releases
1515
========
16+
0.3.1
17+
-----
18+
* extended utils functions to support keyword for passing additional urllib2
19+
handlers.
20+
1621
0.3.0
1722
-----
18-
* Added ndg.httpsclient.utils.fetch_stream_from_url function and added
23+
* Added ndg.httpsclient.utils.fetch_stream_from_url function and added
1924
parameter for data to post in open_url and fetch_* methods.
2025
* fix to ndg.httpsclient.utils module _should_use_proxy and open_url functions
2126
2227
0.2.0
2328
-----
2429
* added support for SSL verification with subjectAltNames using pyasn1
2530
* fixed minor bug - SSL cert DN prefix matching
26-
31+
2732
0.1.0
2833
-----
2934
Initial release
3035
3136
Prerequisites
3237
=============
33-
This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13.
34-
Note that proxy support is only available from Python 2.6.2 onwards. pyasn1 is
38+
This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13.
39+
Note that proxy support is only available from Python 2.6.2 onwards. pyasn1 is
3540
required for correct SSL verification with subjectAltNames.
3641
3742
Installation
3843
============
39-
Installation can be performed using easy_install or pip.
44+
Installation can be performed using easy_install or pip.
4045
4146
Running ndg_httpclient
4247
======================
4348
A simple script for fetching data using HTTP or HTTPS GET from a specified URL.
44-
45-
Parameter::
46-
url The URL of the resource to be fetched
47-
48-
Options::
49-
-h, --help Show help message and exit.
50-
-c FILE, --certificate=FILE
51-
Certificate file - defaults to $HOME/credentials.pem
52-
-k FILE, --private-key=FILE
53-
Private key file - defaults to the certificate file
54-
-t DIR, --ca-certificate-dir=DIR
55-
Trusted CA certificate file directory.
56-
-d, --debug Print debug information - this may be useful in
57-
solving problems with HTTP or HTTPS access to a
58-
server.
59-
-p FILE, --post-data-file=FILE
60-
POST data file
61-
-f FILE, --fetch=FILE Output file
62-
-n, --no-verify-peer Skip verification of peer certificate.
49+
50+
Parameter:
51+
52+
``url``
53+
The URL of the resource to be fetched
54+
55+
Options:
56+
57+
``-h, --help``
58+
Show help message and exit.
59+
60+
``-c FILE, --certificate=FILE``
61+
Certificate file - defaults to ``$HOME/credentials.pem``
62+
63+
``-k FILE, --private-key=FILE``
64+
Private key file - defaults to the certificate file
65+
66+
``-t DIR, --ca-certificate-dir=DIR``
67+
Trusted CA certificate file directory.
68+
69+
``-d, --debug``
70+
Print debug information - this may be useful in solving problems with HTTP or
71+
HTTPS access to a server.
72+
73+
``-p FILE, --post-data-file=FILE``
74+
POST data file
75+
76+
``-f FILE, --fetch=FILE``
77+
Output file
78+
79+
``-n, --no-verify-peer``
80+
Skip verification of peer certificate.
6381
'''
6482

6583
setup(
6684
name='ndg_httpsclient',
67-
version="0.3.0",
85+
version="0.3.1",
6886
description='Provides enhanced HTTPS support for httplib and urllib2 using '
6987
'PyOpenSSL',
7088
author='Richard Wilkinson and Philip Kershaw',

0 commit comments

Comments
 (0)