From 00e9ef7bb60d25c1697cef95becb1fc26cdcc52f Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki Date: Wed, 12 Sep 2012 15:52:12 +0300 Subject: [PATCH 1/1] Catch explicitly ContainerExists in container_create instead of NameError --- snf-pithos-app/pithos/api/functions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snf-pithos-app/pithos/api/functions.py b/snf-pithos-app/pithos/api/functions.py index c27ad1c..490d85f 100644 --- a/snf-pithos-app/pithos/api/functions.py +++ b/snf-pithos-app/pithos/api/functions.py @@ -56,7 +56,7 @@ from pithos.api.util import ( SaveToBackendHandler, object_data_response, put_object_block, hashmap_md5, simple_list_response, api_method) from pithos.api.settings import UPDATE_MD5 -from pithos.backends.base import NotAllowedError, QuotaError, ContainerNotEmpty, ItemNotExists, VersionNotExists +from pithos.backends.base import NotAllowedError, QuotaError, ContainerNotEmpty, ItemNotExists, VersionNotExists, ContainerExists from pithos.backends.filter import parse_filters @@ -390,7 +390,7 @@ def container_create(request, v_account, v_container): raise Forbidden('Not allowed') except ValueError: raise BadRequest('Invalid policy header') - except NameError: + except ContainerExists: ret = 202 if ret == 202 and policy: -- 1.7.10.4