← Back to branch summary

~ubuntu-branches/ubuntu/trusty/swift/trusty-updates

« back to all changes in this revision

Viewing changes to swift/account/utils.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, James Page, Chuck Short
  • Date: 2013-08-13 10:37:13 UTC
  • mfrom: (1.2.21)
  • Revision ID: package-import@ubuntu.com-20130813103713-1ctbx4zifyljs2aq
Tags: 1.9.1-0ubuntu1
[ James Page ]
* d/control: Update VCS fields for new branch locations.

[ Chuck Short ]
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
swift/account/utils.py
17
17
from xml.sax import saxutils
18
18
 
19
19
from swift.common.constraints import FORMAT2CONTENT_TYPE
20
 
from swift.common.swob import HTTPOk, HTTPNoContent, HTTPNotAcceptable, \
21
 
    HTTPBadRequest
22
 
from swift.common.utils import get_param, json, normalize_timestamp
 
20
from swift.common.swob import HTTPOk, HTTPNoContent, HTTPNotAcceptable
 
21
from swift.common.request_helpers import get_param
 
22
from swift.common.utils import json, normalize_timestamp
23
23
 
24
24
 
25
25
class FakeAccountBroker(object):
50
50
    Returns a 2-tuple: (content_type, error). Only one of them will be set;
51
51
    the other will be None.
52
52
    """
53
 
    try:
54
 
        query_format = get_param(req, 'format')
55
 
    except UnicodeDecodeError:
56
 
        return (None, HTTPBadRequest(body='parameters not utf8',
57
 
                                     content_type='text/plain', request=req))
 
53
    query_format = get_param(req, 'format')
58
54
    if query_format:
59
55
        req.accept = FORMAT2CONTENT_TYPE.get(query_format.lower(),
60
56
                                             FORMAT2CONTENT_TYPE['plain'])