From cd0f6c28f11b5aceec4f7dafcea1bb4449fac965 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 4 Jan 2013 10:33:36 +0100 Subject: [PATCH] Add support for Folsom version of Swift This fixes bug #1095897 Change-Id: Idb7a94f103ffd23356938712ed9d2185eed22b98 Signed-off-by: Julien Danjou --- ceilometer/objectstore/swift_middleware.py | 8 +++++++- tools/test-requires-folsom | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ceilometer/objectstore/swift_middleware.py b/ceilometer/objectstore/swift_middleware.py index 18e3afdb..23532021 100644 --- a/ceilometer/objectstore/swift_middleware.py +++ b/ceilometer/objectstore/swift_middleware.py @@ -26,8 +26,14 @@ from ceilometer.openstack.common import cfg from ceilometer.openstack.common import context from ceilometer.openstack.common import timeutils -from swift.common.swob import Request from swift.common.utils import split_path + +try: + # Swift >= 1.7.5 + from swift.common.swob import Request +except ImportError: + from webob import Request + try: # Swift > 1.7.5 from swift.common.utils import InputProxy diff --git a/tools/test-requires-folsom b/tools/test-requires-folsom index 82dd0531..68c1c396 100644 --- a/tools/test-requires-folsom +++ b/tools/test-requires-folsom @@ -21,7 +21,7 @@ setuptools-git>=0.4 # very soon. hg+https://bitbucket.org/cdevienne/wsme pecan -# We should use swift>1.7.5, but it's not yet available -swift +# 1.7.4 is the Folsom release +http://tarballs.openstack.org/swift/swift-stable-folsom.tar.gz # Swift dep that is not necessary if we depend on swift>1.7.5 netifaces