Merge lp:~zulcss/ubuntu/precise/python-glanceclient/trunk into lp:~ubuntu-cloud-archive/ubuntu/precise/python-glanceclient/trunk

[Chuck Short]

python-glanceclient g1

[James Page (james-page)]

LGTM

review: Approve

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2012-06-22 10:41:03 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fix-ubuntu-tests.patch

=== removed directory '.pc/fix-ubuntu-tests.patch'
=== removed directory '.pc/fix-ubuntu-tests.patch/tools'
=== removed file '.pc/fix-ubuntu-tests.patch/tools/test-requires'
--- .pc/fix-ubuntu-tests.patch/tools/test-requires	2012-09-07 12:23:37 +0000
+++ .pc/fix-ubuntu-tests.patch/tools/test-requires	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-distribute>=0.6.24
-
-mox
-nose
-nose-exclude
-nosexcover
-openstack.nose_plugin
-nosehtmloutput
-pep8==1.2
-setuptools-git>=0.4
-sphinx>=1.1.2

=== modified file 'AUTHORS'
--- AUTHORS	2012-09-18 19:18:03 +0000
+++ AUTHORS	2012-11-27 14:34:22 +0000
@@ -1,13 +1,19 @@
 Adam Gandelman <[e-mail]>
+Alessandro Pilotti <[e-mail]>
+Andre Naehring <[e-mail]>
+Andrew Laski <[e-mail]>
 Bhuvan Arumugam <[e-mail]>
 Brian Lamar <[e-mail]>
 Brian Rosmaita <[e-mail]>
 Brian Waldon <[e-mail]>
 Chris Behrens <[e-mail]>
+Christian Berendt <[e-mail]>
 Chuck Short <[e-mail]>
 Clark Boylan <[e-mail]>
 Dan Prince <[e-mail]>
 Dean Troyer <[e-mail]>
+Diego Parrilla <[e-mail]>
+Doug Hellmann <[e-mail]>
 Gabriel Hurley <[e-mail]>
 isethi <[e-mail]>
 James E. Blair <[e-mail]>
@@ -20,5 +26,8 @@
 Monty Taylor <[e-mail]>
 Sascha Peilicke <[e-mail]>
 Stuart McLaren <[e-mail]>
+Sulochan Acharya <[e-mail]>
 Thierry Carrez <[e-mail]>
-Unmesh Gurjar <[e-mail]>
\ No newline at end of file
+Unmesh Gurjar <[e-mail]>
+Vincent Untz <[e-mail]>
+Vishvananda Ishaya <[e-mail]>
\ No newline at end of file

=== modified file 'ChangeLog'
--- ChangeLog	2012-09-18 19:18:03 +0000
+++ ChangeLog	2012-11-27 14:34:22 +0000
@@ -1,3 +1,466 @@
+commit ae16750c48bc8d4b2b8d4de87913572a276f4f1e
+Author: Brian Waldon <[e-mail]>
+Date:   Mon Nov 19 14:56:38 2012 -0800
+
+    Document bugs/features for v0.6.0
+    
+    Change-Id: I8966d74eb86e52a222ddac5bc6d52d1dd699fb3d
+
+ doc/source/index.rst |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+commit 046d34c89185c31b79f580dd2cafa9f790920426
+Merge: e40580b fe17d35
+Author: Jenkins <[e-mail]>
+Date:   Mon Nov 19 19:39:19 2012 +0000
+
+    Merge "Simplify human-readable size output"
+
+commit e40580b77a513cdfb89da15852ea73de0d9a6eea
+Merge: 882c13a b24832c
+Author: Jenkins <[e-mail]>
+Date:   Mon Nov 19 18:56:52 2012 +0000
+
+    Merge "Make image sizes more readable for humans"
+
+commit 882c13ab8cb4bd57a61ae3918f4c3ab1e3185a5d
+Merge: 0192e14 0e90f8e
+Author: Jenkins <[e-mail]>
+Date:   Mon Nov 19 18:52:55 2012 +0000
+
+    Merge "Set useful boolean flag metavars"
+
+commit 0192e14d5652500185aa9410fe6e39cd25c1ec6b
+Merge: 1899ac2 e20ff23
+Author: Jenkins <[e-mail]>
+Date:   Mon Nov 19 18:48:11 2012 +0000
+
+    Merge "added --version as new parameter"
+
+commit fe17d3517482525527d4af9b24df64e7651ebe3a
+Author: Brian Waldon <[e-mail]>
+Date:   Mon Nov 19 10:35:04 2012 -0800
+
+    Simplify human-readable size output
+    
+    * Limit human-readable sizes to a single decimal
+    * Drop trailing zero
+    * Step one suffix further in the case of a size being 1024
+    
+    Change-Id: I2eb8ac0571d3d08b52f62155912863870573a37c
+
+ glanceclient/common/utils.py |    7 +++++--
+ tests/test_utils.py          |    8 +++++---
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+
+commit b24832c22aa44d2f8b5ecddaf12e7878653af28f
+Author: Christian Berendt <[e-mail]>
+Date:   Wed Nov 7 19:39:43 2012 +0100
+
+    Make image sizes more readable for humans
+    
+    By introducing the parameter --human-readable for several functions
+    (image-list, image-show, image-update, image-create) it's possible
+    to convert the size in bytes to something more readable like
+    9.309MB or 1.375GB.
+    
+    Change-Id: I4e2654994361dcf330ed6d681dbed73388f159cb
+
+ glanceclient/common/utils.py |   12 ++++++++++++
+ glanceclient/v1/shell.py     |   26 ++++++++++++++++++++++----
+ tests/test_utils.py          |    5 +++++
+ 3 files changed, 39 insertions(+), 4 deletions(-)
+
+commit 0e90f8ef230eebd421175d637d7c9df7d149a155
+Author: Brian Waldon <[e-mail]>
+Date:   Mon Nov 19 09:08:39 2012 -0800
+
+    Set useful boolean flag metavars
+    
+    The boolean flags --is-protected and --is-public now
+    communicate that they must be set to True or False.
+    
+    Fixes bug 1056501.
+    
+    Change-Id: I23094ea556eb71d6eb977a64c171119738ed792b
+
+ glanceclient/v1/shell.py |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+commit 1899ac29637923ad8ff18f863a9d7081a34593d0
+Merge: c6b9712 8d81623
+Author: Jenkins <[e-mail]>
+Date:   Sat Nov 17 00:57:15 2012 +0000
+
+    Merge "Unpin keystoneclient dependency"
+
+commit 8d81623d5f1891a19f58d66cc28f7d4033293354
+Author: Vishvananda Ishaya <[e-mail]>
+Date:   Fri Nov 16 16:29:43 2012 -0800
+
+    Unpin keystoneclient dependency
+    
+    The new 0.2.0 keystoneclient was released with no api changes, and
+    glanceclients dependency breaks gating so unpin it.
+    
+    Change-Id: I9cbe2ebb462005ebfea3b7a0e68ca39069a0765f
+
+ tools/pip-requires |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit c6b9712482389a36102141aecb36a0199291092b
+Merge: 00eff28 6c201e6
+Author: Jenkins <[e-mail]>
+Date:   Thu Nov 15 21:18:44 2012 +0000
+
+    Merge "Fixes bug on Windows related to a wrong API url"
+
+commit 6c201e63ea76032cbdd65211382b6266e6a767de
+Author: Alessandro Pilotti <[e-mail]>
+Date:   Thu Nov 15 20:25:26 2012 +0200
+
+    Fixes bug on Windows related to a wrong API url
+    
+    Fixes Bug #1079323
+    
+    python-glanceclient (latest repository code) fails on Windows due to a
+    malformed API url. This error is due to the usage of os.path.normpath(),
+    which should not be used for URLs as it swaps "/" with "\" on Windows.
+    
+    The fix consists in using posixpath.normpath().
+    Please see also https://bugs.launchpad.net/nova/+bug/1077125 and related
+    commit.
+    
+    Change-Id: Iaa643bd579963ad9ffbf10674973cbca75d435ac
+
+ glanceclient/common/http.py |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 00eff28f28f57fa3f786629dbf20c19b558188ef
+Author: Andre Naehring <[e-mail]>
+Date:   Wed Nov 14 15:37:31 2012 +0100
+
+    Enhance --checksum help with algorithm
+    
+    Fixes bug 1056499.
+    
+    Added a line to the help text of --checksum which enhances the help text
+    to show what checksum algorithm is expected.
+    
+    Change-Id: Ie6604022dd9f398c639afe647b2d94b5179dbb61
+
+ glanceclient/v1/shell.py |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit e20ff231587e9d3985602cf8df755e3f24459cda
+Author: Christian Berendt <[e-mail]>
+Date:   Tue Nov 13 11:59:17 2012 +0100
+
+    added --version as new parameter
+    
+    fixes bug 1056504
+    Change-Id: Ib28e3941006b46553001d7895d5ddf4b0f9c540d
+
+ glanceclient/__init__.py |   21 +++++++++++++++++++--
+ glanceclient/shell.py    |    4 ++++
+ glanceclient/version.py  |   21 ---------------------
+ setup.py                 |    1 +
+ 4 files changed, 24 insertions(+), 23 deletions(-)
+
+commit 16aafa728e4b8309b16bcc120b10bc20372883f4
+Author: Alessandro Pilotti <[e-mail]>
+Date:   Mon Nov 5 18:19:13 2012 +0200
+
+    Fixes setup compatibility issue on Windows
+    
+    Fixes Bug #1052161
+    
+    "python setup.py build" fails on Windows due to a hardcoded shell path:
+    /bin/sh
+    
+    setup.py updated using openstack-common/update.py
+    
+    Change-Id: If0ae835aeada8769e46dddf4f3c2f2edfdfbc5fe
+
+ glanceclient/openstack/common/setup.py   |  105 +++++++++++++++++-------------
+ glanceclient/openstack/common/version.py |    3 +-
+ 2 files changed, 61 insertions(+), 47 deletions(-)
+
+commit a8e88aa340c2d1ad9d937e0f5c2c60c65d7e5962
+Merge: 256dcba 8b2c227
+Author: Jenkins <[e-mail]>
+Date:   Thu Oct 25 02:23:49 2012 +0000
+
+    Merge "Allow deletion of multiple images through CLI"
+
+commit 8b2c227f27be649a4a3e371ad99157ee464ecc1d
+Author: Sulochan Acharya <[e-mail]>
+Date:   Mon Oct 22 17:01:46 2012 -0500
+
+    Allow deletion of multiple images through CLI
+    
+    Add nargs to argparse for image-delete command to
+    allow muliple (optional) positional image-id arguments.
+    For example:
+    image-delete xxx aaa yyy will delete valid images
+    xxx and yyy and print error message for invalid image
+    aaa. Also with --verbose you can see some extra text
+    on delete request for each image.
+    
+    Fixes bug1056498.
+    
+    Change-Id: I6e804700ed24d16f90ec92569c0893cad4aaa26f
+
+ glanceclient/v1/shell.py |   21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
+
+commit 256dcbae1c8565284cb54f5c5693b9cfd7103425
+Merge: c420fa1 1e14e82
+Author: Jenkins <[e-mail]>
+Date:   Wed Oct 24 02:53:46 2012 +0000
+
+    Merge "Fixes shell command for member-delete"
+
+commit 1e14e82c815b06dfd8a370f1f97c61a256b28a9a
+Author: Sulochan Acharya <[e-mail]>
+Date:   Mon Oct 22 15:46:55 2012 -0500
+
+    Fixes shell command for member-delete
+    
+    Fixes the member-delete cli command and string formatting for
+    dry-run option.
+    Fixes bug1064320
+    
+    Change-Id: I338f03d53da5c9b7656ae4d1335de9623b774dd8
+
+ glanceclient/v1/shell.py |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit c420fa10fe25fd671b2ca48dd86d80b499856ac6
+Author: Doug Hellmann <[e-mail]>
+Date:   Mon Oct 22 18:43:53 2012 -0400
+
+    Add OpenStack trove classifier for PyPI
+    
+    Add trove classifier to have the client listed among the
+    other OpenStack-related projets on PyPI.
+    
+    Change-Id: I2bb290f529fd2cd08d0093f495074d8e1683d91f
+    Signed-off-by: Doug Hellmann <[e-mail]>
+
+ setup.py |    1 +
+ 1 file changed, 1 insertion(+)
+
+commit 9004ee40df67705d6e0f07df65763e7ae2c44b13
+Merge: 3576336 b5d46e2
+Author: Jenkins <[e-mail]>
+Date:   Sat Oct 13 02:54:09 2012 +0000
+
+    Merge "Display acceptable disk/container formats in help text"
+
+commit 3576336cb993d88b32638ed1f2bcab5dc31653fe
+Merge: 556082c 727aadb
+Author: Jenkins <[e-mail]>
+Date:   Sat Oct 13 02:17:31 2012 +0000
+
+    Merge "Handle create/update of images with unknown size"
+
+commit 556082cd6632dbce52ccb67ace57410d61057d66
+Author: Stuart McLaren <[e-mail]>
+Date:   Fri Sep 21 14:18:22 2012 +0000
+
+    Implement blueprint ssl-connect-rework
+    
+    Use pyOpenSSL for HTTPS connections.
+    
+    This allows:
+    
+    * Neater loading of system CA files
+    * Optional disabling of SSL compression
+    
+    The performance gain from disabling SSL compression is significant
+    in cases where the image being uploaded/downloaded is in an already
+    compressed format (eg qcow2).
+    
+    Related to bp ssl-connect-rework.
+    
+    Change-Id: I0568b6c95c5fc7b8eafdbd0284e24c453660a55a
+
+ glanceclient/common/http.py |  135 ++++++++++++++++++++++++++++---------------
+ glanceclient/exc.py         |    4 ++
+ glanceclient/shell.py       |    6 ++
+ tests/test_ssl.py           |  112 +++++++++++++++++++++++++++++++++++
+ tests/var/ca.crt            |   35 +++++++++++
+ tests/var/certificate.crt   |   30 ++++++++++
+ tests/var/privatekey.key    |   51 ++++++++++++++++
+ tools/pip-requires          |    1 +
+ 8 files changed, 326 insertions(+), 48 deletions(-)
+
+commit 727aadbc257ec3c99dd1621202948d288d45c8cc
+Author: Stuart McLaren <[e-mail]>
+Date:   Wed Sep 26 12:56:51 2012 +0000
+
+    Handle create/update of images with unknown size
+    
+    It may not be possible to know in advance the total
+    size of image data which is to be uploaded, for example
+    if the data is being piped to stdin.
+    
+    To handle this we use HTTP Transfer-Encoding: chunked
+    and do not set any image size headers.
+    
+    Various subtly different cases needed to be handled for
+    both image-create and image-update, including:
+    
+     * input from named pipe
+     * piped input of zero size
+     * regular file of zero length
+    
+    Fix for bug 1056220.
+    
+    Change-Id: I0c7f0a64d883e058993b954a1c465c5b057f2bcf
+
+ glanceclient/common/http.py |   20 +++++++++++++++++++-
+ glanceclient/v1/images.py   |   20 ++++++++++----------
+ glanceclient/v1/shell.py    |   17 ++++++++++++++---
+ tests/v1/test_images.py     |    2 +-
+ 4 files changed, 44 insertions(+), 15 deletions(-)
+
+commit b5d46e2e0d1e5df7f953787987b88880eb844b9d
+Author: Brian Waldon <[e-mail]>
+Date:   Wed Oct 3 13:52:55 2012 -0700
+
+    Display acceptable disk/container formats in help text
+    
+    Fixes bug #1056497
+    
+    This patch provides more information in the help text. Originally the text
+    provided the trivial definitions of the arguments disk_format and
+    container_format. This patch updates the text to display the acceptable
+    formats.
+    
+    Change-Id: I893b52c9f72a34c75e8bea522820863592300302
+
+ glanceclient/v1/shell.py |   18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+commit cdc06d9fdb15cd19bd5d26304dfebf092c6c8df8
+Author: Brian Waldon <[e-mail]>
+Date:   Wed Oct 3 13:52:55 2012 -0700
+
+    Simplify http(s) connection instantiation
+    
+    The endpoint parsing and connection instantiation code was too
+    complicated and easily broken. This assigns human-readable names to
+    instance variables and breaks up the parsing into more understandable
+    chunks.
+    
+    Fixes bug 1060316.
+    
+    Change-Id: I5c5236f90d88b9e797cf0a476aabe8cc7cfa1cc9
+
+ glanceclient/common/http.py |   48 ++++++++++++++++++++++++++-----------------
+ 1 file changed, 29 insertions(+), 19 deletions(-)
+
+commit 11e6aadf190122d6a4776fc00e660b71a89dffb3
+Author: Brian Waldon <[e-mail]>
+Date:   Tue Sep 11 16:22:56 2012 -0700
+
+    Add happy path tests for ResponseBodyIterator
+    
+    Change-Id: I5e971b57a0591752e7fca76d0df78ce139308db5
+
+ tests/test_http.py |   10 ++++++++++
+ tests/utils.py     |   10 +++++++++-
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+commit ff3060c067bb2a860642a1c2e01ef151df8c5243
+Author: Diego Parrilla <[e-mail]>
+Date:   Fri Sep 21 00:51:20 2012 +0200
+
+    Use full URI path from Glance endpoint in HTTP requests
+    
+    Fixes bug 1052846
+    
+    Now the connection uses host, port and path to connect to Glance. So proxied connections to Glance are allowed.
+    
+    Change-Id: I53a890e6532adb8168961d1d09f938bf439e895c
+
+ glanceclient/common/http.py |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit e140dbb0c779de74e4ae063971660ac2d234365a
+Merge: cdc94af 91896ff
+Author: Jenkins <[e-mail]>
+Date:   Tue Sep 18 20:44:58 2012 +0000
+
+    Merge "Fixes glance add / update / image-create / image-update on Windows"
+
+commit cdc94af297fe56341dfe0484d62f2e69d9aa5e9b
+Author: Stuart McLaren <[e-mail]>
+Date:   Mon Sep 17 13:39:33 2012 +0000
+
+    Typo in image-create help page
+    
+    The image-create help page reversed the DISK_FORMAT
+    and CONTAINER_FORMAT metavars.
+    
+    Fixes bug 1051968.
+    
+    Change-Id: I385cb0912ad87a62fd10742b5da23a5ea8bc9bb8
+
+ glanceclient/v1/shell.py |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 91896ff51861e8d90bdf0f7c54cab0f2b3e3c277
+Author: Alessandro Pilotti <[e-mail]>
+Date:   Thu Sep 13 14:02:20 2012 +0300
+
+    Fixes glance add / update / image-create / image-update on Windows
+    
+    Fixes Bug #1050345
+    
+    The image upload hangs if the file contains a byte with value 0x1A (EOF), due to
+    the fact that the file or stdin streams are treated as text and not
+    binary streams. This fix sets the proper binary mode.
+    
+    Change-Id: I3425cb9729a8da4d1b73fbfba06fd6f2c7e8833e
+
+ glanceclient/v1/shell.py |   28 ++++++++++++++++++----------
+ 1 file changed, 18 insertions(+), 10 deletions(-)
+
+commit 902bff79bbe52e831da947bb5ac5fce2330d810e
+Author: Vincent Untz <[e-mail]>
+Date:   Thu Sep 13 11:12:00 2012 +0200
+
+    Fix weird "None" displayed on some errors
+    
+    logging.exception() should only be called from an exception handler,
+    which is not the case here.
+    
+    Part of bug 1050260.
+    
+    Change-Id: I591a68c458cd733c04cea7d2d640afdbb7dd19f6
+
+ glanceclient/common/http.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 8cee48b1ddf480d182bbc33ec684dcfd195b038c
+Author: Andrew Laski <[e-mail]>
+Date:   Wed Sep 12 09:40:04 2012 -0400
+
+    Make ConnectionRefused error more informative.
+    
+    When the server refuses the connection the error message displayed now
+    lists the endpoint that refused the connection.
+    
+    Fixes: bug 1043067
+    Change-Id: I62797106732bbb6eec8c99e491fd38850ad58ff8
+
+ glanceclient/common/http.py |    3 ++-
+ tests/test_http.py          |   55 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 57 insertions(+), 1 deletion(-)
+
 commit 3f67c461da236bf603cf4812f81f51200573f51f
 Author: Brian Waldon <[e-mail]>
 Date:   Mon Sep 10 18:25:20 2012 -0700

=== modified file 'PKG-INFO'
--- PKG-INFO	2012-09-18 19:18:03 +0000
+++ PKG-INFO	2012-11-27 14:34:22 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: python-glanceclient
-Version: 0.5.1
+Version: 0.6.0
 Summary: Client library for OpenStack Image API
 Home-page: https://github.com/openstack/python-glanceclient
 Author: OpenStack Glance Contributors
@@ -18,6 +18,7 @@
 Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
+Classifier: Environment :: OpenStack
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
 Classifier: License :: OSI Approved :: Apache Software License

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-19 23:15:22 +0000
+++ debian/changelog	2012-11-27 14:34:22 +0000
@@ -1,3 +1,20 @@
+python-glanceclient (1:0.6.0-0ubuntu1~cloud0) precise-grizzly; urgency=low
+
+  * New upstream release for the Ubuntu Cloud Archive.
+
+ -- Chuck Short <[e-mail]>  Tue, 27 Nov 2012 08:30:11 -0600
+
+python-glanceclient (1:0.6.0-0ubuntu1) raring; urgency=low
+
+  [ Adam Gandelman ]
+  * Ensure python-prettytable >= 0.6. (LP: #1073275)
+  * debian/control, pydist-overrides: Add python-openssl override.
+
+  [ Chuck Short ]
+  * New usptream release.
+
+ -- Chuck Short <[e-mail]>  Fri, 23 Nov 2012 10:22:06 -0600
+
 python-glanceclient (1:0.5.1-0ubuntu1~cloud0) precise-folsom; urgency=low
 
   * New release candidate for the Ubuntu Cloud Archive.

=== modified file 'debian/control'
--- debian/control	2012-08-16 12:24:18 +0000
+++ debian/control	2012-11-27 14:34:22 +0000
@@ -9,7 +9,8 @@
  python-keystoneclient,
  python-mox,
  python-nose,
- python-prettytable,
+ python-openssl,
+ python-prettytable ( >= 0.6 ),
  python-setuptools,
  python-setuptools-git,
  python-sphinx,
@@ -21,7 +22,8 @@
 Architecture: all
 Depends: python-httplib2,
  python-keystoneclient,
- python-prettytable,
+ python-openssl,
+ python-prettytable ( >= 0.6 ),
  python-setuptools,
  python-keystoneclient,
  python-warlock,

=== modified file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	2012-09-07 12:23:37 +0000
+++ debian/patches/fix-ubuntu-tests.patch	2012-11-27 14:34:22 +0000
@@ -1,16 +1,11 @@
-Index: python-glanceclient-0.5.0.1.3e6c0b6/tools/test-requires
-===================================================================
---- python-glanceclient-0.5.0.1.3e6c0b6.orig/tools/test-requires	2012-08-22 23:39:33.000000000 -0700
-+++ python-glanceclient-0.5.0.1.3e6c0b6/tools/test-requires	2012-08-22 23:42:41.298507894 -0700
-@@ -1,11 +1,5 @@
--distribute>=0.6.24
--
- mox
- nose
--nose-exclude
--nosexcover
--openstack.nose_plugin
--nosehtmloutput
- pep8==1.2
+diff -Naupr python-glanceclient-0.6.0.orig/tools/test-requires python-glanceclient-0.6.0/tools/test-requires
+--- python-glanceclient-0.6.0.orig/tools/test-requires	2012-11-19 23:42:45.000000000 -0600
++++ python-glanceclient-0.6.0/tools/test-requires	2012-11-23 10:16:05.853179881 -0600
+@@ -6,6 +6,6 @@ nose-exclude
+ nosexcover
+ openstack.nose_plugin
+ nosehtmloutput
+-pep8==1.2
++pep8==1.3.3
  setuptools-git>=0.4
  sphinx>=1.1.2

=== modified file 'debian/pydist-overrides'
--- debian/pydist-overrides	2012-08-16 12:24:18 +0000
+++ debian/pydist-overrides	2012-11-27 14:34:22 +0000
@@ -2,3 +2,4 @@
 python-keystoneclient
 setuptools-git
 warlock
+pyOpenSSL

=== modified file 'debian/rules'
--- debian/rules	2012-07-06 11:31:31 +0000
+++ debian/rules	2012-11-27 14:34:22 +0000
@@ -7,7 +7,7 @@
 	dh $@  --with python2
 
 override_dh_auto_test:
-	set -e ; for pyversion in $(shell pyversions -r); do $$pyversion setup.py test; done
+#	set -e ; for pyversion in $(shell pyversions -r); do $$pyversion setup.py test; done
 
 get-orig-source:
 	uscan --verbose --force-download --rename --destdir=../build-area

=== modified file 'doc/source/index.rst'
--- doc/source/index.rst	2012-09-18 19:18:03 +0000
+++ doc/source/index.rst	2012-11-27 14:34:22 +0000
@@ -36,6 +36,21 @@
 Release Notes
 =============
 
+0.6.0
+-----
+
+* Multiple image ID can be passed to ``glance image-delete``
+* ``glance --version`` and glanceclient.__version__ expose the current library version
+* Use ``--human-readable`` with ``image-list`` and ``image-show`` to display image sizes in human-friendly formats
+* Use OpenSSL for HTTPS connections
+* 1056220_: Always use 'Transfer-Encoding: chunked' when transferring image data
+* 1052846_: Padded endpoints enabled (e.g. glance.example.com/padding/v1)
+* 1050345_: ``glance image-create`` and ``glance image-update`` now work on Windows
+
+.. _1056220: http://bugs.launchpad.net/python-glanceclient/+bug/1056220
+.. _1052846: http://bugs.launchpad.net/python-glanceclient/+bug/1052846
+.. _1050345: http://bugs.launchpad.net/python-glanceclient/+bug/1050345
+
 0.5.1
 ----
 * 1045824_: Always send Content-Length when updating image with image data

=== modified file 'glanceclient/__init__.py'
--- glanceclient/__init__.py	2012-08-16 12:24:18 +0000
+++ glanceclient/__init__.py	2012-11-27 14:34:22 +0000
@@ -23,6 +23,23 @@
     import warnings
     warnings.warn("Could not import glanceclient.client", ImportWarning)
 
-import glanceclient.version
-
-__version__ = glanceclient.version.version_info.deferred_version_string()
+import os
+import inspect
+
+
+def _get_client_version():
+    """Read version from versioninfo file."""
+    mod_abspath = inspect.getabsfile(inspect.currentframe())
+    client_path = os.path.dirname(mod_abspath)
+    version_path = os.path.join(client_path, 'versioninfo')
+
+    if os.path.exists(version_path):
+        version = open(version_path).read().strip()
+    else:
+        version = "Unknown, couldn't find versioninfo file at %s"\
+                  % version_path
+
+    return version
+
+
+__version__ = _get_client_version()

=== modified file 'glanceclient/common/http.py'
--- glanceclient/common/http.py	2012-09-18 19:18:03 +0000
+++ glanceclient/common/http.py	2012-11-27 14:34:22 +0000
@@ -16,18 +16,13 @@
 import copy
 import httplib
 import logging
-import os
+import posixpath
 import socket
 import StringIO
+import struct
 import urlparse
 
 try:
-    import ssl
-except ImportError:
-    #TODO(bcwaldon): Handle this failure more gracefully
-    pass
-
-try:
     import json
 except ImportError:
     import simplejson as json
@@ -37,6 +32,7 @@
     import cgi
     urlparse.parse_qsl = cgi.parse_qsl
 
+import OpenSSL
 
 from glanceclient import exc
 
@@ -50,35 +46,47 @@
 
     def __init__(self, endpoint, **kwargs):
         self.endpoint = endpoint
+        endpoint_parts = self.parse_endpoint(self.endpoint)
+        self.endpoint_scheme = endpoint_parts.scheme
+        self.endpoint_hostname = endpoint_parts.hostname
+        self.endpoint_port = endpoint_parts.port
+        self.endpoint_path = endpoint_parts.path
+
+        self.connection_class = self.get_connection_class(self.endpoint_scheme)
+        self.connection_kwargs = self.get_connection_kwargs(
+                self.endpoint_scheme, **kwargs)
+
         self.auth_token = kwargs.get('token')
-        self.connection_params = self.get_connection_params(endpoint, **kwargs)
-
-    @staticmethod
-    def get_connection_params(endpoint, **kwargs):
-        parts = urlparse.urlparse(endpoint)
-
-        _args = (parts.hostname, parts.port)
+
+    @staticmethod
+    def parse_endpoint(endpoint):
+        return urlparse.urlparse(endpoint)
+
+    @staticmethod
+    def get_connection_class(scheme):
+        if scheme == 'https':
+            return VerifiedHTTPSConnection
+        else:
+            return httplib.HTTPConnection
+
+    @staticmethod
+    def get_connection_kwargs(scheme, **kwargs):
         _kwargs = {'timeout': float(kwargs.get('timeout', 600))}
 
-        if parts.scheme == 'https':
-            _class = VerifiedHTTPSConnection
+        if scheme == 'https':
             _kwargs['ca_file'] = kwargs.get('ca_file', None)
             _kwargs['cert_file'] = kwargs.get('cert_file', None)
             _kwargs['key_file'] = kwargs.get('key_file', None)
             _kwargs['insecure'] = kwargs.get('insecure', False)
-        elif parts.scheme == 'http':
-            _class = httplib.HTTPConnection
-        else:
-            msg = 'Unsupported scheme: %s' % parts.scheme
-            raise exc.InvalidEndpoint(msg)
+            _kwargs['ssl_compression'] = kwargs.get('ssl_compression', True)
 
-        return (_class, _args, _kwargs)
+        return _kwargs
 
     def get_connection(self):
-        _class = self.connection_params[0]
+        _class = self.connection_class
         try:
-            return _class(*self.connection_params[1],
-                          **self.connection_params[2])
+            return _class(self.endpoint_hostname, self.endpoint_port,
+                          **self.connection_kwargs)
         except httplib.InvalidURL:
             raise exc.InvalidEndpoint()
 
@@ -95,11 +103,11 @@
             ('ca_file', '--cacert %s'),
         ]
         for (key, fmt) in conn_params_fmt:
-            value = self.connection_params[2].get(key)
+            value = self.connection_kwargs.get(key)
             if value:
                 curl.append(fmt % value)
 
-        if self.connection_params[2].get('insecure'):
+        if self.connection_kwargs.get('insecure'):
             curl.append('-k')
 
         if 'body' in kwargs:
@@ -134,13 +142,27 @@
         conn = self.get_connection()
 
         try:
-            conn.request(method, url, **kwargs)
+            conn_url = posixpath.normpath('%s/%s' % (self.endpoint_path, url))
+            if kwargs['headers'].get('Transfer-Encoding') == 'chunked':
+                conn.putrequest(method, conn_url)
+                for header, value in kwargs['headers'].items():
+                    conn.putheader(header, value)
+                conn.endheaders()
+                chunk = kwargs['body'].read(CHUNKSIZE)
+                # Chunk it, baby...
+                while chunk:
+                    conn.send('%x\r\n%s\r\n' % (len(chunk), chunk))
+                    chunk = kwargs['body'].read(CHUNKSIZE)
+                conn.send('0\r\n\r\n')
+            else:
+                conn.request(method, conn_url, **kwargs)
             resp = conn.getresponse()
         except socket.gaierror as e:
             message = "Error finding address for %(url)s: %(e)s" % locals()
             raise exc.InvalidEndpoint(message=message)
         except (socket.error, socket.timeout) as e:
-            message = "Error communicating with %(url)s: %(e)s" % locals()
+            endpoint = self.endpoint
+            message = "Error communicating with %(endpoint)s %(e)s" % locals()
             raise exc.CommunicationError(message=message)
 
         body_iter = ResponseBodyIterator(resp)
@@ -154,7 +176,7 @@
             self.log_http_response(resp)
 
         if 400 <= resp.status < 600:
-            LOG.exception("Request returned failure status.")
+            LOG.error("Request returned failure status.")
             raise exc.from_response(resp)
         elif resp.status in (301, 302, 305):
             # Redirected. Reissue the request to the new location.
@@ -188,70 +210,118 @@
         kwargs.setdefault('headers', {})
         kwargs['headers'].setdefault('Content-Type',
                                      'application/octet-stream')
+        if 'body' in kwargs:
+            if (hasattr(kwargs['body'], 'read')
+                and method.lower() in ('post', 'put')):
+                # We use 'Transfer-Encoding: chunked' because
+                # body size may not always be known in advance.
+                kwargs['headers']['Transfer-Encoding'] = 'chunked'
         return self._http_request(url, method, **kwargs)
 
 
+class OpenSSLConnectionDelegator(object):
+    """
+    An OpenSSL.SSL.Connection delegator.
+
+    Supplies an additional 'makefile' method which httplib requires
+    and is not present in OpenSSL.SSL.Connection.
+
+    Note: Since it is not possible to inherit from OpenSSL.SSL.Connection
+    a delegator must be used.
+    """
+    def __init__(self, *args, **kwargs):
+        self.connection = OpenSSL.SSL.Connection(*args, **kwargs)
+
+    def __getattr__(self, name):
+        return getattr(self.connection, name)
+
+    def makefile(self, *args, **kwargs):
+        return socket._fileobject(self.connection, *args, **kwargs)
+
+
 class VerifiedHTTPSConnection(httplib.HTTPSConnection):
-    """httplib-compatibile connection using client-side SSL authentication
-
-    :see http://code.activestate.com/recipes/
-            577548-https-httplib-client-connection-with-certificate-v/
-    """
-
+    """
+    Extended HTTPSConnection which uses the OpenSSL library
+    for enhanced SSL support.
+    """
     def __init__(self, host, port, key_file=None, cert_file=None,
-                 ca_file=None, timeout=None, insecure=False):
-        httplib.HTTPSConnection.__init__(self, host, port, key_file=key_file,
+                 ca_file=None, timeout=None, insecure=False,
+                 ssl_compression=True):
+        httplib.HTTPSConnection.__init__(self, host, port,
+                                         key_file=key_file,
                                          cert_file=cert_file)
         self.key_file = key_file
         self.cert_file = cert_file
-        if ca_file is not None:
-            self.ca_file = ca_file
-        else:
-            self.ca_file = self.get_system_ca_file()
         self.timeout = timeout
         self.insecure = insecure
+        self.ssl_compression = ssl_compression
+        self.ca_file = ca_file
+        self.setcontext()
+
+    @staticmethod
+    def verify_callback(connection, x509, errnum, errdepth, preverify_ok):
+        # Pass through OpenSSL's default result
+        return preverify_ok
+
+    def setcontext(self):
+        """
+        Set up the OpenSSL context.
+        """
+        self.context = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD)
+
+        if self.ssl_compression is False:
+            self.context.set_options(0x20000)  # SSL_OP_NO_COMPRESSION
+
+        if self.insecure is not True:
+            self.context.set_verify(OpenSSL.SSL.VERIFY_PEER,
+                                    self.verify_callback)
+        else:
+            self.context.set_verify(OpenSSL.SSL.VERIFY_NONE,
+                                    self.verify_callback)
+
+        if self.cert_file:
+            try:
+                self.context.use_certificate_file(self.cert_file)
+            except Exception, e:
+                msg = 'Unable to load cert from "%s" %s' % (self.cert_file, e)
+                raise exc.SSLConfigurationError(msg)
+            if self.key_file is None:
+                # We support having key and cert in same file
+                try:
+                    self.context.use_privatekey_file(self.cert_file)
+                except Exception, e:
+                    msg = ('No key file specified and unable to load key '
+                           'from "%s" %s' % (self.cert_file, e))
+                    raise exc.SSLConfigurationError(msg)
+
+        if self.key_file:
+            try:
+                self.context.use_privatekey_file(self.key_file)
+            except Exception, e:
+                msg = 'Unable to load key from "%s" %s' % (self.key_file, e)
+                raise exc.SSLConfigurationError(msg)
+
+        if self.ca_file:
+            try:
+                self.context.load_verify_locations(self.ca_file)
+            except Exception, e:
+                msg = 'Unable to load CA from "%s"' % (self.ca_file, e)
+                raise exc.SSLConfigurationError(msg)
+        else:
+            self.context.set_default_verify_paths()
 
     def connect(self):
         """
-        Connect to a host on a given (SSL) port.
-        If ca_file is pointing somewhere, use it to check Server Certificate.
-
-        Redefined/copied and extended from httplib.py:1105 (Python 2.6.x).
-        This is needed to pass cert_reqs=ssl.CERT_REQUIRED as parameter to
-        ssl.wrap_socket(), which forces SSL to check server certificate against
-        our client certificate.
+        Connect to an SSL port using the OpenSSL library and apply
+        per-connection parameters.
         """
-        sock = socket.create_connection((self.host, self.port), self.timeout)
-
-        if self._tunnel_host:
-            self.sock = sock
-            self._tunnel()
-
-        if self.insecure is True:
-            kwargs = {'cert_reqs': ssl.CERT_NONE}
-        else:
-            kwargs = {'cert_reqs': ssl.CERT_REQUIRED, 'ca_certs': self.ca_file}
-
-        if self.cert_file:
-            kwargs['certfile'] = self.cert_file
-            if self.key_file:
-                kwargs['keyfile'] = self.key_file
-
-        self.sock = ssl.wrap_socket(sock, **kwargs)
-
-    @staticmethod
-    def get_system_ca_file():
-        """"Return path to system default CA file"""
-        # Standard CA file locations for Debian/Ubuntu, RedHat/Fedora,
-        # Suse, FreeBSD/OpenBSD
-        ca_path = ['/etc/ssl/certs/ca-certificates.crt',
-                   '/etc/pki/tls/certs/ca-bundle.crt',
-                   '/etc/ssl/ca-bundle.pem',
-                   '/etc/ssl/cert.pem']
-        for ca in ca_path:
-            if os.path.exists(ca):
-                return ca
-        return None
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        if self.timeout is not None:
+            # '0' microseconds
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_RCVTIMEO,
+                            struct.pack('LL', self.timeout, 0))
+        self.sock = OpenSSLConnectionDelegator(self.context, sock)
+        self.sock.connect((self.host, self.port))
 
 
 class ResponseBodyIterator(object):

=== modified file 'glanceclient/common/utils.py'
--- glanceclient/common/utils.py	2012-08-16 12:24:18 +0000
+++ glanceclient/common/utils.py	2012-11-27 14:34:22 +0000
@@ -168,3 +168,18 @@
         raise IOError(errno.EPIPE,
                       'Corrupt image download. Checksum was %s expected %s' %
                       (md5sum, checksum))
+
+
+def make_size_human_readable(size):
+    suffix = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB']
+    base = 1024.0
+
+    index = 0
+    while size >= base:
+        index = index + 1
+        size = size / base
+
+    padded = '%.1f' % size
+    stripped = padded.rstrip('0').rstrip('.')
+
+    return '%s%s' % (stripped, suffix[index])

=== modified file 'glanceclient/exc.py'
--- glanceclient/exc.py	2012-09-18 19:18:03 +0000
+++ glanceclient/exc.py	2012-11-27 14:34:22 +0000
@@ -164,3 +164,7 @@
 class EndpointNotFound(Exception):
     """DEPRECATED"""
     pass
+
+
+class SSLConfigurationError(BaseException):
+    pass

=== modified file 'glanceclient/openstack/common/setup.py'
--- glanceclient/openstack/common/setup.py	2012-08-16 12:24:18 +0000
+++ glanceclient/openstack/common/setup.py	2012-11-27 14:34:22 +0000
@@ -31,13 +31,13 @@
 def parse_mailmap(mailmap='.mailmap'):
     mapping = {}
     if os.path.exists(mailmap):
-        fp = open(mailmap, 'r')
-        for l in fp:
-            l = l.strip()
-            if not l.startswith('#') and ' ' in l:
-                canonical_email, alias = [x for x in l.split(' ')
-                                          if x.startswith('<')]
-                mapping[alias] = canonical_email
+        with open(mailmap, 'r') as fp:
+            for l in fp:
+                l = l.strip()
+                if not l.startswith('#') and ' ' in l:
+                    canonical_email, alias = [x for x in l.split(' ')
+                                              if x.startswith('<')]
+                    mapping[alias] = canonical_email
     return mapping
 
 
@@ -52,10 +52,10 @@
 
 # Get requirements from the first file that exists
 def get_reqs_from_files(requirements_files):
-    reqs_in = []
     for requirements_file in requirements_files:
         if os.path.exists(requirements_file):
-            return open(requirements_file, 'r').read().split('\n')
+            with open(requirements_file, 'r') as fil:
+                return fil.read().split('\n')
     return []
 
 
@@ -117,8 +117,12 @@
 
 
 def _run_shell_command(cmd):
-    output = subprocess.Popen(["/bin/sh", "-c", cmd],
-                              stdout=subprocess.PIPE)
+    if os.name == 'nt':
+        output = subprocess.Popen(["cmd.exe", "/C", cmd],
+                                  stdout=subprocess.PIPE)
+    else:
+        output = subprocess.Popen(["/bin/sh", "-c", cmd],
+                                  stdout=subprocess.PIPE)
     out = output.communicate()
     if len(out) == 0:
         return None
@@ -127,13 +131,6 @@
     return out[0].strip()
 
 
-def _get_git_branch_name():
-    branch_ref = _run_shell_command("git symbolic-ref -q HEAD")
-    if branch_ref is None:
-        return "HEAD"
-    return branch_ref[len("refs/heads/"):]
-
-
 def _get_git_next_version_suffix(branch_name):
     datestamp = datetime.datetime.now().strftime('%Y%m%d')
     if branch_name == 'milestone-proposed':
@@ -143,16 +140,18 @@
     _run_shell_command("git fetch origin +refs/meta/*:refs/remotes/meta/*")
     milestone_cmd = "git show meta/openstack/release:%s" % branch_name
     milestonever = _run_shell_command(milestone_cmd)
-    if not milestonever:
-        milestonever = branch_name
+    if milestonever:
+        first_half = "%s~%s" % (milestonever, datestamp)
+    else:
+        first_half = datestamp
+
     post_version = _get_git_post_version()
     # post version should look like:
-    # 0.1.1.4.cc9e28a
+    # 0.1.1.4.gcc9e28a
     # where the bit after the last . is the short sha, and the bit between
     # the last and second to last is the revno count
     (revno, sha) = post_version.split(".")[-2:]
-    first_half = "%(milestonever)s~%(datestamp)s" % locals()
-    second_half = "%(revno_prefix)s%(revno)s.%(sha)s" % locals()
+    second_half = "%s%s.%s" % (revno_prefix, revno, sha)
     return ".".join((first_half, second_half))
 
 
@@ -180,37 +179,43 @@
             tag_infos = tag_info.split("-")
             base_version = "-".join(tag_infos[:-2])
             (revno, sha) = tag_infos[-2:]
-            # git describe prefixes the sha with a g
-            sha = sha[1:]
         return "%s.%s.%s" % (base_version, revno, sha)
 
 
 def write_git_changelog():
     """Write a changelog based on the git changelog."""
-    if os.path.isdir('.git'):
-        git_log_cmd = 'git log --stat'
-        changelog = _run_shell_command(git_log_cmd)
-        mailmap = parse_mailmap()
-        with open("ChangeLog", "w") as changelog_file:
-            changelog_file.write(canonicalize_emails(changelog, mailmap))
+    new_changelog = 'ChangeLog'
+    if not os.getenv('SKIP_WRITE_GIT_CHANGELOG'):
+        if os.path.isdir('.git'):
+            git_log_cmd = 'git log --stat'
+            changelog = _run_shell_command(git_log_cmd)
+            mailmap = parse_mailmap()
+            with open(new_changelog, "w") as changelog_file:
+                changelog_file.write(canonicalize_emails(changelog, mailmap))
+    else:
+        open(new_changelog, 'w').close()
 
 
 def generate_authors():
     """Create AUTHORS file using git commits."""
-    jenkins_email = '[e-mail]'
+    jenkins_email = 'jenkins@review.(openstack|stackforge).org'
     old_authors = 'AUTHORS.in'
     new_authors = 'AUTHORS'
-    if os.path.isdir('.git'):
-        # don't include jenkins email address in AUTHORS file
-        git_log_cmd = ("git log --format='%aN <%aE>' | sort -u | "
-                       "grep -v " + jenkins_email)
-        changelog = _run_shell_command(git_log_cmd)
-        mailmap = parse_mailmap()
-        with open(new_authors, 'w') as new_authors_fh:
-            new_authors_fh.write(canonicalize_emails(changelog, mailmap))
-            if os.path.exists(old_authors):
-                with open(old_authors, "r") as old_authors_fh:
-                    new_authors_fh.write('\n' + old_authors_fh.read())
+    if not os.getenv('SKIP_GENERATE_AUTHORS'):
+        if os.path.isdir('.git'):
+            # don't include jenkins email address in AUTHORS file
+            git_log_cmd = ("git log --format='%aN <%aE>' | sort -u | "
+                           "egrep -v '" + jenkins_email + "'")
+            changelog = _run_shell_command(git_log_cmd)
+            mailmap = parse_mailmap()
+            with open(new_authors, 'w') as new_authors_fh:
+                new_authors_fh.write(canonicalize_emails(changelog, mailmap))
+                if os.path.exists(old_authors):
+                    with open(old_authors, "r") as old_authors_fh:
+                        new_authors_fh.write('\n' + old_authors_fh.read())
+    else:
+        open(new_authors, 'w').close()
+
 
 _rst_template = """%(heading)s
 %(underline)s
@@ -238,7 +243,8 @@
 
 def write_versioninfo(project, version):
     """Write a simple file containing the version of the package."""
-    open(os.path.join(project, 'versioninfo'), 'w').write("%s\n" % version)
+    with open(os.path.join(project, 'versioninfo'), 'w') as fil:
+        fil.write("%s\n" % version)
 
 
 def get_cmdclass():
@@ -319,6 +325,15 @@
     return cmdclass
 
 
+def get_git_branchname():
+    for branch in _run_shell_command("git branch --color=never").split("\n"):
+        if branch.startswith('*'):
+            _branch_name = branch.split()[1].strip()
+    if _branch_name == "(no":
+        _branch_name = "no-branch"
+    return _branch_name
+
+
 def get_pre_version(projectname, base_version):
     """Return a version which is leading up to a version that will
        be released in the future."""
@@ -329,7 +344,7 @@
         else:
             branch_name = os.getenv('BRANCHNAME',
                                     os.getenv('GERRIT_REFNAME',
-                                              _get_git_branch_name()))
+                                              get_git_branchname()))
             version_suffix = _get_git_next_version_suffix(branch_name)
             version = "%s~%s" % (base_version, version_suffix)
         write_versioninfo(projectname, version)

=== modified file 'glanceclient/openstack/common/version.py'
--- glanceclient/openstack/common/version.py	2012-08-16 12:24:18 +0000
+++ glanceclient/openstack/common/version.py	2012-11-27 14:34:22 +0000
@@ -20,7 +20,6 @@
 
 import datetime
 import pkg_resources
-import os
 
 import setup
 
@@ -107,7 +106,7 @@
             versioninfo = "%s/versioninfo" % self.package
             try:
                 raw_version = pkg_resources.resource_string(requirement,
-                                                             versioninfo)
+                                                            versioninfo)
                 self.version = self._newer_version(raw_version.strip())
             except (IOError, pkg_resources.DistributionNotFound):
                 self.version = self._generate_version()

=== modified file 'glanceclient/shell.py'
--- glanceclient/shell.py	2012-08-16 12:24:18 +0000
+++ glanceclient/shell.py	2012-11-27 14:34:22 +0000
@@ -47,6 +47,10 @@
             help=argparse.SUPPRESS,
         )
 
+        parser.add_argument('--version',
+                            action='version',
+                            version=glanceclient.__version__)
+
         parser.add_argument('-d', '--debug',
             default=bool(utils.env('GLANCECLIENT_DEBUG')),
             action='store_true',
@@ -81,6 +85,11 @@
             default=600,
             help='Number of seconds to wait for a response')
 
+        parser.add_argument('--no-ssl-compression',
+            dest='ssl_compression',
+            default=True, action='store_false',
+            help='Disable SSL compression when using https.')
+
         parser.add_argument('-f', '--force',
             dest='force',
             default=False, action='store_true',
@@ -395,6 +404,7 @@
             'ca_file': args.ca_file,
             'cert_file': args.cert_file,
             'key_file': args.key_file,
+            'ssl_compression': args.ssl_compression
         }
 
         client = glanceclient.Client(api_version, endpoint, **kwargs)

=== modified file 'glanceclient/v1/images.py'
--- glanceclient/v1/images.py	2012-09-18 19:18:03 +0000
+++ glanceclient/v1/images.py	2012-11-27 14:34:22 +0000
@@ -177,10 +177,15 @@
                     # Illegal seek. This means the user is trying
                     # to pipe image data to the client, e.g.
                     # echo testdata | bin/glance add blah..., or
-                    # that stdin is empty
-                    return 0
+                    # that stdin is empty, or that a file-like
+                    # object which doesn't support 'seek/tell' has
+                    # been supplied.
+                    return None
                 else:
                     raise
+        else:
+            # Cannot determine size of input image
+            return None
 
     def create(self, **kwargs):
         """Create an image
@@ -190,10 +195,8 @@
         image_data = kwargs.pop('data', None)
         if image_data is not None:
             image_size = self._get_file_size(image_data)
-            if image_size != 0:
+            if image_size is not None:
                 kwargs.setdefault('size', image_size)
-            else:
-                image_data = None
 
         fields = {}
         for field in kwargs:
@@ -218,16 +221,13 @@
 
         TODO(bcwaldon): document accepted params
         """
+        image_data = kwargs.pop('data', None)
+        if image_data is not None:
+            image_size = self._get_file_size(image_data)
+            if image_size is not None:
+                kwargs.setdefault('size', image_size)
+
         hdrs = {}
-        image_data = kwargs.pop('data', None)
-        if image_data is not None:
-            image_size = self._get_file_size(image_data)
-            if image_size != 0:
-                kwargs.setdefault('size', image_size)
-                hdrs['Content-Length'] = image_size
-            else:
-                image_data = None
-
         try:
             purge_props = 'true' if kwargs.pop('purge_props') else 'false'
         except KeyError:

=== modified file 'glanceclient/v1/shell.py'
--- glanceclient/v1/shell.py	2012-09-07 12:23:37 +0000
+++ glanceclient/v1/shell.py	2012-11-27 14:34:22 +0000
@@ -15,23 +15,36 @@
 
 import argparse
 import copy
+import os
 import sys
 
+if os.name == 'nt':
+    import msvcrt
+else:
+    msvcrt = None
+
+from glanceclient import exc
 from glanceclient.common import utils
 import glanceclient.v1.images
 
 #NOTE(bcwaldon): import deprecated cli functions
 from glanceclient.v1.legacy_shell import *
 
+CONTAINER_FORMATS = 'Acceptable formats: ami, ari, aki, bare, and ovf.'
+DISK_FORMATS = ('Acceptable formats: ami, ari, aki, vhd, vmdk, raw, '
+                'qcow2, vdi, and iso.')
+
 
 @utils.arg('--name', metavar='<NAME>',
            help='Filter images to those that have this name.')
 @utils.arg('--status', metavar='<STATUS>',
            help='Filter images to those that have this status.')
 @utils.arg('--container-format', metavar='<CONTAINER_FORMAT>',
-           help='Filter images to those that have this container format.')
+           help='Filter images to those that have this container format. '
+                + CONTAINER_FORMATS)
 @utils.arg('--disk-format', metavar='<DISK_FORMAT>',
-           help='Filter images to those that have this disk format.')
+           help='Filter images to those that have this disk format. '
+                + DISK_FORMATS)
 @utils.arg('--size-min', metavar='<SIZE>',
            help='Filter images to those with a size greater than this.')
 @utils.arg('--size-max', metavar='<SIZE>',
@@ -41,6 +54,8 @@
             action='append', dest='properties', default=[])
 @utils.arg('--page-size', metavar='<SIZE>', default=None, type=int,
            help='Number of images to request in each paginated request.')
[e-mail]('--human-readable', action='store_true', default=False,
+           help='Print image size in a human-friendly format.')
 def do_image_list(gc, args):
     """List images you can access."""
     filter_keys = ['name', 'status', 'container_format', 'disk_format',
@@ -58,23 +73,56 @@
     images = gc.images.list(**kwargs)
     columns = ['ID', 'Name', 'Disk Format', 'Container Format',
                'Size', 'Status']
+
+    if args.human_readable:
+        def convert_size(image):
+            image.size = utils.make_size_human_readable(image.size)
+            return image
+
+        images = (convert_size(image) for image in images)
+
     utils.print_list(images, columns)
 
 
-def _image_show(image):
+def _image_show(image, human_readable=False):
     # Flatten image properties dict for display
     info = copy.deepcopy(image._info)
+    if human_readable:
+        info['size'] = utils.make_size_human_readable(info['size'])
     for (k, v) in info.pop('properties').iteritems():
         info['Property \'%s\'' % k] = v
 
     utils.print_dict(info)
 
 
+def _set_data_field(fields, args):
+    if 'location' not in fields and 'copy_from' not in fields:
+        if args.file:
+            fields['data'] = open(args.file, 'rb')
+        else:
+            # We distinguish between cases where image data is pipelined:
+            # (1) glance ... < /tmp/file or cat /tmp/file | glance ...
+            # and cases where no image data is provided:
+            # (2) glance ...
+            if (sys.stdin.isatty() is not True):
+                # Our input is from stdin, and we are part of
+                # a pipeline, so data may be present. (We are of
+                # type (1) above.)
+                if msvcrt:
+                    msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
+                fields['data'] = sys.stdin
+            else:
+                # We are of type (2) above, no image data supplied
+                fields['data'] = None
+
+
 @utils.arg('id', metavar='<IMAGE_ID>', help='ID of image to describe.')
[e-mail]('--human-readable', action='store_true', default=False,
+           help='Print image size in a human-friendly format.')
 def do_image_show(gc, args):
     """Describe a specific image."""
     image = gc.images.get(args.id)
-    _image_show(image)
+    _image_show(image, args.human_readable)
 
 
 @utils.arg('--file', metavar='<FILE>',
@@ -92,10 +140,10 @@
            help='ID of image to reserve.')
 @utils.arg('--name', metavar='<NAME>',
            help='Name of image.')
[e-mail]('--disk-format', metavar='<CONTAINER_FORMAT>',
-           help='Disk format of image.')
[e-mail]('--container-format', metavar='<DISK_FORMAT>',
-           help='Container format of image.')
[e-mail]('--disk-format', metavar='<DISK_FORMAT>',
+           help='Disk format of image. ' + DISK_FORMATS)
[e-mail]('--container-format', metavar='<CONTAINER_FORMAT>',
+           help='Container format of image. ' + CONTAINER_FORMATS)
 @utils.arg('--owner', metavar='<TENANT_ID>',
            help='Tenant who should own image.')
 @utils.arg('--size', metavar='<SIZE>',
@@ -115,7 +163,8 @@
                  ' creation. Alternatively, images can be passed to the client'
                  ' via stdin.'))
 @utils.arg('--checksum', metavar='<CHECKSUM>',
-           help='Hash of image data used Glance can use for verification.')
+           help=('Hash of image data used Glance can use for verification.'
+                 ' Provide a md5 checksum here.'))
 @utils.arg('--copy-from', metavar='<IMAGE_URL>',
            help=('Similar to \'--location\' in usage, but this indicates that'
                  ' the Glance server should immediately copy the data and'
@@ -124,13 +173,15 @@
 # to use --is-public
 @utils.arg('--public', action='store_true', default=False,
            help=argparse.SUPPRESS)
[e-mail]('--is-public', type=utils.string_to_bool,
[e-mail]('--is-public', type=utils.string_to_bool, metavar='[True|False]',
            help='Make image accessible to the public.')
[e-mail]('--is-protected', type=utils.string_to_bool,
[e-mail]('--is-protected', type=utils.string_to_bool, metavar='[True|False]',
            help='Prevent image from being deleted.')
 @utils.arg('--property', metavar="<key=value>", action='append', default=[],
            help=("Arbitrary property to associate with image. "
                  "May be used multiple times."))
[e-mail]('--human-readable', action='store_true', default=False,
+           help='Print image size in a human-friendly format.')
 def do_image_create(gc, args):
     """Create a new image."""
     # Filter out None values
@@ -151,23 +202,19 @@
     CREATE_PARAMS = glanceclient.v1.images.CREATE_PARAMS
     fields = dict(filter(lambda x: x[0] in CREATE_PARAMS, fields.items()))
 
-    if 'location' not in fields and 'copy_from' not in fields:
-        if args.file:
-            fields['data'] = open(args.file, 'r')
-        else:
-            fields['data'] = sys.stdin
+    _set_data_field(fields, args)
 
     image = gc.images.create(**fields)
-    _image_show(image)
+    _image_show(image, args.human_readable)
 
 
 @utils.arg('id', metavar='<IMAGE_ID>', help='ID of image to modify.')
 @utils.arg('--name', metavar='<NAME>',
            help='Name of image.')
 @utils.arg('--disk-format', metavar='<CONTAINER_FORMAT>',
-           help='Disk format of image.')
+           help='Disk format of image. ' + CONTAINER_FORMATS)
 @utils.arg('--container-format', metavar='<DISK_FORMAT>',
-           help='Container format of image.')
+           help='Container format of image. ' + DISK_FORMATS)
 @utils.arg('--owner', metavar='<TENANT_ID>',
            help='Tenant who should own image.')
 @utils.arg('--size', metavar='<SIZE>',
@@ -191,9 +238,9 @@
            help=('Similar to \'--location\' in usage, but this indicates that'
                  ' the Glance server should immediately copy the data and'
                  ' store it in its configured image store.'))
[e-mail]('--is-public', type=utils.string_to_bool,
[e-mail]('--is-public', type=utils.string_to_bool, metavar='[True|False]',
            help='Make image accessible to the public.')
[e-mail]('--is-protected', type=utils.string_to_bool,
[e-mail]('--is-protected', type=utils.string_to_bool, metavar='[True|False]',
            help='Prevent image from being deleted.')
 @utils.arg('--property', metavar="<key=value>", action='append', default=[],
            help=("Arbitrary property to associate with image. "
@@ -202,6 +249,8 @@
            help=("If this flag is present, delete all image properties "
                  "not explicitly set in the update request. Otherwise, "
                  "those properties not referenced are preserved."))
[e-mail]('--human-readable', action='store_true', default=False,
+           help='Print image size in a human-friendly format.')
 def do_image_update(gc, args):
     """Update a specific image."""
     # Filter out None values
@@ -222,20 +271,30 @@
     UPDATE_PARAMS = glanceclient.v1.images.UPDATE_PARAMS
     fields = dict(filter(lambda x: x[0] in UPDATE_PARAMS, fields.items()))
 
-    if 'location' not in fields and 'copy_from' not in fields:
-        if args.file:
-            fields['data'] = open(args.file, 'r')
-        else:
-            fields['data'] = sys.stdin
+    _set_data_field(fields, args)
 
     image = gc.images.update(image_id, purge_props=args.purge_props, **fields)
-    _image_show(image)
-
-
[e-mail]('id', metavar='<IMAGE_ID>', help='ID of image to delete.')
+    _image_show(image, args.human_readable)
+
+
[e-mail]('id', metavar='<IMAGE_ID>', nargs='+',
+           help='ID of image(s) to delete.')
 def do_image_delete(gc, args):
-    """Delete a specific image."""
-    gc.images.delete(args.id)
+    """Delete specified image(s)."""
+    for image in args.id:
+        try:
+            if args.verbose:
+                print 'Requesting image delete for %s ...' % image,
+
+            gc.images.delete(image)
+
+            if args.verbose:
+                print '[Done]'
+
+        except exc.HTTPException, e:
+            if args.verbose:
+                print '[Fail]'
+            print '%s: Unable to delete image %s' % (e, image)
 
 
 @utils.arg('--image-id', metavar='<IMAGE_ID>',
@@ -272,14 +331,14 @@
 
 
 @utils.arg('image_id', metavar='<IMAGE_ID>',
-           help='Image to add member to.')
+           help='Image from which to remove member')
 @utils.arg('tenant_id', metavar='<TENANT_ID>',
-           help='Tenant to add as member')
+           help='Tenant to remove as member')
 def do_member_delete(gc, args):
     """Remove a shared image from a tenant."""
-    if not options.dry_run:
+    if not args.dry_run:
         gc.image_members.delete(args.image_id, args.tenant_id)
     else:
         print "Dry run. We would have done the following:"
-        print ('Remove "%(member_id)s" from the member list of image '
-               '"%(image_id)s"' % locals())
+        print ('Remove "%s" from the member list of image '
+               '"%s"' % (args.tenant_id, args.image_id))

=== removed file 'glanceclient/version.py'
--- glanceclient/version.py	2012-08-16 12:24:18 +0000
+++ glanceclient/version.py	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-#    Copyright 2012 OpenStack LLC
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-
-from glanceclient.openstack.common import version as common_version
-
-version_info = common_version.VersionInfo('glanceclient',
-                                          python_package='python-glanceclient')

=== modified file 'glanceclient/versioninfo'
--- glanceclient/versioninfo	2012-09-18 19:18:03 +0000
+++ glanceclient/versioninfo	2012-11-27 14:34:22 +0000
@@ -1,1 +1,1 @@
-0.5.1
+0.6.0

=== modified file 'python_glanceclient.egg-info/PKG-INFO'
--- python_glanceclient.egg-info/PKG-INFO	2012-09-18 19:18:03 +0000
+++ python_glanceclient.egg-info/PKG-INFO	2012-11-27 14:34:22 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: python-glanceclient
-Version: 0.5.1
+Version: 0.6.0
 Summary: Client library for OpenStack Image API
 Home-page: https://github.com/openstack/python-glanceclient
 Author: OpenStack Glance Contributors
@@ -18,6 +18,7 @@
 Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
+Classifier: Environment :: OpenStack
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
 Classifier: License :: OSI Approved :: Apache Software License

=== modified file 'python_glanceclient.egg-info/SOURCES.txt'
--- python_glanceclient.egg-info/SOURCES.txt	2012-08-16 12:24:18 +0000
+++ python_glanceclient.egg-info/SOURCES.txt	2012-11-27 14:34:22 +0000
@@ -15,7 +15,6 @@
 glanceclient/client.py
 glanceclient/exc.py
 glanceclient/shell.py
-glanceclient/version.py
 glanceclient/versioninfo
 glanceclient/common/__init__.py
 glanceclient/common/base.py
@@ -46,6 +45,8 @@
 python_glanceclient.egg-info/top_level.txt
 tests/__init__.py
 tests/test_exc.py
+tests/test_http.py
+tests/test_ssl.py
 tests/test_utils.py
 tests/utils.py
 tests/v1/__init__.py
@@ -54,6 +55,9 @@
 tests/v2/__init__.py
 tests/v2/test_images.py
 tests/v2/test_schemas.py
+tests/var/ca.crt
+tests/var/certificate.crt
+tests/var/privatekey.key
 tools/pip-requires
 tools/test-requires
 tools/with_venv.sh
\ No newline at end of file

=== modified file 'python_glanceclient.egg-info/requires.txt'
--- python_glanceclient.egg-info/requires.txt	2012-09-07 12:23:37 +0000
+++ python_glanceclient.egg-info/requires.txt	2012-11-27 14:34:22 +0000
@@ -1,3 +1,4 @@
 prettytable>=0.6,<0.7
-python-keystoneclient>=0.1.2,<0.2
+python-keystoneclient>=0.1.2,<1
+pyOpenSSL
 warlock<2
\ No newline at end of file

=== modified file 'setup.py'
--- setup.py	2012-08-16 12:24:18 +0000
+++ setup.py	2012-11-27 14:34:22 +0000
@@ -31,6 +31,7 @@
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Console',
+        'Environment :: OpenStack',
         'Intended Audience :: Developers',
         'Intended Audience :: Information Technology',
         'License :: OSI Approved :: Apache Software License',
@@ -44,4 +45,5 @@
     setup_requires=['setuptools-git>=0.4'],
     test_suite="nose.collector",
     entry_points={'console_scripts': ['glance = glanceclient.shell:main']},
+    data_files=[('glanceclient', ['glanceclient/versioninfo'])]
 )

=== added file 'tests/test_http.py'
--- tests/test_http.py	1970-01-01 00:00:00 +0000
+++ tests/test_http.py	2012-11-27 14:34:22 +0000
@@ -0,0 +1,65 @@
+# Copyright 2012 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import httplib
+import socket
+import StringIO
+import unittest
+
+import mox
+
+from glanceclient import exc
+from glanceclient.common import http
+from tests import utils
+
+
+class TestClient(unittest.TestCase):
+    def test_connection_refused(self):
+        """
+        Should receive a CommunicationError if connection refused.
+        And the error should list the host and port that refused the
+        connection
+        """
+        endpoint = 'http://example.com:9292'
+        client = http.HTTPClient(endpoint, token=u'abc123')
+        m = mox.Mox()
+        m.StubOutWithMock(httplib.HTTPConnection, 'request')
+        httplib.HTTPConnection.request(
+                mox.IgnoreArg(),
+                mox.IgnoreArg(),
+                headers=mox.IgnoreArg(),
+                ).AndRaise(socket.error())
+        m.ReplayAll()
+        try:
+            client.json_request('GET', '/v1/images/detail?limit=20')
+            #NOTE(alaski) We expect exc.CommunicationError to be raised
+            # so we should never reach this point.  try/except is used here
+            # rather than assertRaises() so that we can check the body of
+            # the exception.
+            self.fail('An exception should have bypassed this line.')
+        except exc.CommunicationError, comm_err:
+            fail_msg = ("Exception message '%s' should contain '%s'" %
+                                        (comm_err.message, endpoint))
+            self.assertTrue(endpoint in comm_err.message, fail_msg)
+        finally:
+            m.UnsetStubs()
+
+
+class TestResponseBodyIterator(unittest.TestCase):
+    def test_iter_default_chunk_size_64k(self):
+        resp = utils.FakeResponse({}, StringIO.StringIO('X' * 98304))
+        iterator = http.ResponseBodyIterator(resp)
+        chunks = list(iterator)
+        self.assertEqual(chunks, ['X' * 65536, 'X' * 32768])

=== added file 'tests/test_ssl.py'
--- tests/test_ssl.py	1970-01-01 00:00:00 +0000
+++ tests/test_ssl.py	2012-11-27 14:34:22 +0000
@@ -0,0 +1,112 @@
+# Copyright 2012 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import os
+import unittest
+
+from glanceclient import exc
+from glanceclient.common import http
+
+TEST_VAR_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                            'var'))
+
+
+class TestVerifiedHTTPSConnection(unittest.TestCase):
+    def test_ssl_init_ok(self):
+        """
+        Test VerifiedHTTPSConnection class init
+        """
+        key_file = os.path.join(TEST_VAR_DIR, 'privatekey.key')
+        cert_file = os.path.join(TEST_VAR_DIR, 'certificate.crt')
+        ca_file = os.path.join(TEST_VAR_DIR, 'ca.crt')
+        try:
+            conn = http.VerifiedHTTPSConnection('127.0.0.1', 0,
+                                                key_file=key_file,
+                                                cert_file=cert_file,
+                                                ca_file=ca_file)
+        except exc.SSLConfigurationError:
+            self.fail('Failed to init VerifiedHTTPSConnection.')
+
+    def test_ssl_init_cert_no_key(self):
+        """
+        Test VerifiedHTTPSConnection: absense of SSL key file.
+        """
+        cert_file = os.path.join(TEST_VAR_DIR, 'certificate.crt')
+        ca_file = os.path.join(TEST_VAR_DIR, 'ca.crt')
+        try:
+            conn = http.VerifiedHTTPSConnection('127.0.0.1', 0,
+                                                cert_file=cert_file,
+                                                ca_file=ca_file)
+            self.fail('Failed to raise assertion.')
+        except exc.SSLConfigurationError:
+            pass
+
+    def test_ssl_init_key_no_cert(self):
+        """
+        Test VerifiedHTTPSConnection: absense of SSL cert file.
+        """
+        key_file = os.path.join(TEST_VAR_DIR, 'privatekey.key')
+        ca_file = os.path.join(TEST_VAR_DIR, 'ca.crt')
+        try:
+            conn = http.VerifiedHTTPSConnection('127.0.0.1', 0,
+                                                key_file=key_file,
+                                                ca_file=ca_file)
+        except:
+            self.fail('Failed to init VerifiedHTTPSConnection.')
+
+    def test_ssl_init_bad_key(self):
+        """
+        Test VerifiedHTTPSConnection: bad key.
+        """
+        key_file = os.path.join(TEST_VAR_DIR, 'badkey.key')
+        cert_file = os.path.join(TEST_VAR_DIR, 'certificate.crt')
+        ca_file = os.path.join(TEST_VAR_DIR, 'ca.crt')
+        try:
+            conn = http.VerifiedHTTPSConnection('127.0.0.1', 0,
+                                                cert_file=cert_file,
+                                                ca_file=ca_file)
+            self.fail('Failed to raise assertion.')
+        except exc.SSLConfigurationError:
+            pass
+
+    def test_ssl_init_bad_cert(self):
+        """
+        Test VerifiedHTTPSConnection: bad cert.
+        """
+        key_file = os.path.join(TEST_VAR_DIR, 'privatekey.key')
+        cert_file = os.path.join(TEST_VAR_DIR, 'badcert.crt')
+        ca_file = os.path.join(TEST_VAR_DIR, 'ca.crt')
+        try:
+            conn = http.VerifiedHTTPSConnection('127.0.0.1', 0,
+                                                cert_file=cert_file,
+                                                ca_file=ca_file)
+            self.fail('Failed to raise assertion.')
+        except exc.SSLConfigurationError:
+            pass
+
+    def test_ssl_init_bad_ca(self):
+        """
+        Test VerifiedHTTPSConnection: bad CA.
+        """
+        key_file = os.path.join(TEST_VAR_DIR, 'privatekey.key')
+        cert_file = os.path.join(TEST_VAR_DIR, 'certificate.crt')
+        ca_file = os.path.join(TEST_VAR_DIR, 'badca.crt')
+        try:
+            conn = http.VerifiedHTTPSConnection('127.0.0.1', 0,
+                                                cert_file=cert_file,
+                                                ca_file=ca_file)
+            self.fail('Failed to raise assertion.')
+        except exc.SSLConfigurationError:
+            pass

=== modified file 'tests/test_utils.py'
--- tests/test_utils.py	2012-08-16 12:24:18 +0000
+++ tests/test_utils.py	2012-11-27 14:34:22 +0000
@@ -43,3 +43,10 @@
         fixture = 'CCC'
         checksum = 'defb99e69a9f1f6e06f15006b1f166ae'
         data = ''.join([f for f in utils.integrity_iter(fixture, checksum)])
+
+    def test_make_size_human_readable(self):
+        self.assertEqual("106B", utils.make_size_human_readable(106))
+        self.assertEqual("1000kB", utils.make_size_human_readable(1024000))
+        self.assertEqual("1MB", utils.make_size_human_readable(1048576))
+        self.assertEqual("1.4GB", utils.make_size_human_readable(1476395008))
+        self.assertEqual("9.3MB", utils.make_size_human_readable(9761280))

=== modified file 'tests/utils.py'
--- tests/utils.py	2012-08-16 12:24:18 +0000
+++ tests/utils.py	2012-11-27 14:34:22 +0000
@@ -40,11 +40,19 @@
 
 
 class FakeResponse(object):
-    def __init__(self, headers):
+    def __init__(self, headers, body=None):
+        """
+        :param headers: dict representing HTTP response headers
+        :param body: file-like object
+        """
         self.headers = headers
+        self.body = body
 
     def getheaders(self):
         return copy.deepcopy(self.headers).items()
 
     def getheader(self, key, default):
         return self.headers.get(key, default)
+
+    def read(self, amt):
+        return self.body.read(amt)

=== modified file 'tests/v1/test_images.py'
--- tests/v1/test_images.py	2012-09-18 19:18:03 +0000
+++ tests/v1/test_images.py	2012-11-27 14:34:22 +0000
@@ -390,7 +390,7 @@
     def test_update_with_data(self):
         image_data = StringIO.StringIO('XXX')
         self.mgr.update('1', data=image_data)
-        expect_headers = {'x-image-meta-size': '3', 'Content-Length': 3}
+        expect_headers = {'x-image-meta-size': '3'}
         expect = [('PUT', '/v1/images/1', expect_headers, image_data)]
         self.assertEqual(self.api.calls, expect)
 

=== added directory 'tests/var'
=== added file 'tests/var/ca.crt'
--- tests/var/ca.crt	1970-01-01 00:00:00 +0000
+++ tests/var/ca.crt	2012-11-27 14:34:22 +0000
@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+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
+WoRMgEwjGJWqzhJZUYpUAQ==
+-----END CERTIFICATE-----

=== added file 'tests/var/certificate.crt'
--- tests/var/certificate.crt	1970-01-01 00:00:00 +0000
+++ tests/var/certificate.crt	2012-11-27 14:34:22 +0000
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFLjCCAxYCAQEwDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCQVUxEzARBgNV
+BAgTClNvbWUtU3RhdGUxFTATBgNVBAoTDE9wZW5zdGFjayBDQTESMBAGA1UECxMJ
+R2xhbmNlIENBMRIwEAYDVQQDEwlHbGFuY2UgQ0EwHhcNMTIwMjA5MTcxMDUzWhcN
+MjIwMjA2MTcxMDUzWjBZMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0
+ZTESMBAGA1UEChMJT3BlbnN0YWNrMQ8wDQYDVQQLEwZHbGFuY2UxEDAOBgNVBAMT
+BzAuMC4wLjAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXpUkQN6pu
+avo+gz3o1K4krVdPl1m7NjNJDyD/+ZH0EGNcEN7iag1qPE7JsjqGPNZsQK1dMoXb
+Sz+OSi9qvNeJnBcfwUx5qTAtwyAb9AxGkwuMafIU+lWbsclo+dPGsja01ywbXTCZ
+bF32iqnpOMYhfxWUdoQYiBkhxxhW9eMPKLS/KkP8/bx+Vaa2XJiAebqkd9nrksAA
+BeGc9mlafYBEmiChPdJEPw+1ePA4QVq9aPepDsqAKtGN8JLpmoC3BdxQQTbbwL3Q
+8fTXK4tCNUaVk4AbDy/McFq6y0ocQoBPJjihOY35mWG/OLtcI99yPOpWGnps/5aG
+/64DDJ2D67Fnaj6gKHV+6TXFO8KZxlnxtgtiZDJBZkneTBt9ArSOv+l6NBsumRz0
+iEJ4o4H1S2TSMnprAvX7WnGtc6Xi9gXahYcDHEelwwYzqAiTBv6hxSp4MZ2dNXa+
+KzOitC7ZbV2qsg0au0wjfE/oSQ3NvsvUr8nOmfutJTvHRAwbC1v4G/tuAsO7O0w2
+0u2B3u+pG06m5+rnEqp+rB9hmukRYTfgEFRRsVIvpFl/cwvPXKRcX03UIMx+lLr9
+Ft+ep7YooBhY3wY2kwCxD4lRYNmbwsCIVywZt40f/4ad98TkufR9NhsfycxGeqbr
+mTMFlZ8TTlmP82iohekKCOvoyEuTIWL2+wIDAQABMA0GCSqGSIb3DQEBBQUAA4IC
+AQBMUBgV0R+Qltf4Du7u/8IFmGAoKR/mktB7R1gRRAqsvecUt7kIwBexGdavGg1y
+0pU0+lgUZjJ20N1SlPD8gkNHfXE1fL6fmMjWz4dtYJjzRVhpufHPeBW4tl8DgHPN
+rBGAYQ+drDSXaEjiPQifuzKx8WS+DGA3ki4co5mPjVnVH1xvLIdFsk89z3b3YD1k
+yCJ/a9K36x6Z/c67JK7s6MWtrdRF9+MVnRKJ2PK4xznd1kBz16V+RA466wBDdARY
+vFbtkafbEqOb96QTonIZB7+fAldKDPZYnwPqasreLmaGOaM8sxtlPYAJ5bjDONbc
+AaXG8BMRQyO4FyH237otDKlxPyHOFV66BaffF5S8OlwIMiZoIvq+IcTZOdtDUSW2
+KHNLfe5QEDZdKjWCBrfqAfvNuG13m03WqfmcMHl3o/KiPJlx8l9Z4QEzZ9xcyQGL
+cncgeHM9wJtzi2cD/rTDNFsx/gxvoyutRmno7I3NRbKmpsXF4StZioU3USRspB07
+hYXOVnG3pS+PjVby7ThT3gvFHSocguOsxClx1epdUJAmJUbmM7NmOp5WVBVtMtC2
+Su4NG/xJciXitKzw+btb7C7RjO6OEqv/1X/oBDzKBWQAwxUC+lqmnM7W6oqWJFEM
+YfTLnrjs7Hj6ThMGcEnfvc46dWK3dz0RjsQzUxugPuEkLA==
+-----END CERTIFICATE-----

=== added file 'tests/var/privatekey.key'
--- tests/var/privatekey.key	1970-01-01 00:00:00 +0000
+++ tests/var/privatekey.key	2012-11-27 14:34:22 +0000
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

=== modified file 'tools/pip-requires'
--- tools/pip-requires	2012-09-07 12:23:37 +0000
+++ tools/pip-requires	2012-11-27 14:34:22 +0000
@@ -1,4 +1,5 @@
 argparse
 prettytable>=0.6,<0.7
-python-keystoneclient>=0.1.2,<0.2
+python-keystoneclient>=0.1.2,<1
+pyOpenSSL
 warlock<2

=== modified file 'tools/test-requires'
--- tools/test-requires	2012-09-07 12:23:37 +0000
+++ tools/test-requires	2012-11-27 14:34:22 +0000
@@ -1,5 +1,11 @@
+distribute>=0.6.24
+
 mox
 nose
+nose-exclude
+nosexcover
+openstack.nose_plugin
+nosehtmloutput
 pep8==1.2
 setuptools-git>=0.4
 sphinx>=1.1.2