From 52ec0429762a1a8a25e8741a8833419441507904 Mon Sep 17 00:00:00 2001 From: Dragos Manolescu Date: Thu, 3 Nov 2011 22:17:16 -0700 Subject: [PATCH] Fixes the HTTPConflict import. AccountController.PUT references HTTPConflict but doesn't import it. Fixed the import and verified with setup.py test and pep8 Change-Id: I13b3fa57a72f0112bc6af012e438634fa7d893c1 --- swift/account/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/swift/account/server.py b/swift/account/server.py index 28c199f836..2c320df691 100644 --- a/swift/account/server.py +++ b/swift/account/server.py @@ -24,7 +24,8 @@ from xml.sax import saxutils from webob import Request, Response from webob.exc import HTTPAccepted, HTTPBadRequest, \ HTTPCreated, HTTPForbidden, HTTPInternalServerError, \ - HTTPMethodNotAllowed, HTTPNoContent, HTTPNotFound, HTTPPreconditionFailed + HTTPMethodNotAllowed, HTTPNoContent, HTTPNotFound, \ + HTTPPreconditionFailed, HTTPConflict import simplejson from swift.common.db import AccountBroker