Merge remote-tracking branch 'upstream/master' into python-registry-v2

2015-09-04 16:32:01 -04:00 · 2015-09-04 16:32:01 -04:00 · 210ed7cf02
commit 210ed7cf02
parent 6cf13c72ed 1635104280
148 changed files with 1829 additions and 445 deletions
--- a/storage/swift.py
+++ b/storage/swift.py
@ -24,7 +24,11 @@ class SwiftStorage(BaseStorage):
    self._swift_user = swift_user
    self._swift_password = swift_password

-    self._auth_version = auth_version or 2
+    try:
+      self._auth_version = int(auth_version or '2')
+    except ValueError:
+      self._auth_version = 2
+
    self._os_options = os_options or {}

    self._initialized = False