Revision d546637f
b/snf-django-lib/snf_django/lib/api/__init__.py | ||
---|---|---|
138 | 138 |
return decorator |
139 | 139 |
|
140 | 140 |
|
141 |
def get_serialization(request, format_allowed=True, default_serialization="json"): |
|
141 |
def get_serialization(request, format_allowed=True, |
|
142 |
default_serialization="json"): |
|
142 | 143 |
"""Return the serialization format requested. |
143 | 144 |
|
144 | 145 |
Valid formats are 'json' and 'xml' and 'text' |
... | ... | |
191 | 192 |
if not response.has_header("Content-Length"): |
192 | 193 |
# compatibility code for django 1.4 |
193 | 194 |
_is_string = getattr(response, '_is_string', None) |
194 |
_base_content_is_iter = getattr(response, '_base_content_is_iter', None) |
|
195 |
_base_content_is_iter = getattr(response, '_base_content_is_iter', |
|
196 |
None) |
|
195 | 197 |
if (_is_string is not None and _is_string) or\ |
196 | 198 |
(_base_content_is_iter is not None and |
197 | 199 |
not _base_content_is_iter): |
b/snf-django-lib/snf_django/lib/api/proxy/utils.py | ||
---|---|---|
43 | 43 |
|
44 | 44 |
def forward_header(k): |
45 | 45 |
return k.upper() not in ['HOST', 'CONTENT_LENGTH', 'CONTENT_TYPE'] and \ |
46 |
not is_hop_by_hop(k) and not '.' in k |
|
46 |
not is_hop_by_hop(k) and not '.' in k |
b/snf-django-lib/snf_django/lib/db/managers.py | ||
---|---|---|
32 | 32 |
from django.db.models.query import QuerySet, EmptyQuerySet |
33 | 33 |
from django.db.models.sql.datastructures import EmptyResultSet |
34 | 34 |
|
35 |
|
|
35 | 36 |
class ForUpdateManager(Manager): |
36 | 37 |
""" Model manager implementing SELECT .. FOR UPDATE statement |
37 | 38 |
|
... | ... | |
60 | 61 |
return query[0] |
61 | 62 |
if not num: |
62 | 63 |
raise self.model.DoesNotExist( |
63 |
"%s matching query does not exist. "
|
|
64 |
"Lookup parameters were %s" %
|
|
65 |
(self.model._meta.object_name, kwargs))
|
|
64 |
"%s matching query does not exist. " |
|
65 |
"Lookup parameters were %s" % |
|
66 |
(self.model._meta.object_name, kwargs)) |
|
66 | 67 |
raise self.model.MultipleObjectsReturned( |
67 | 68 |
"get() returned more than one %s -- it returned %s! " |
68 | 69 |
"Lookup parameters were %s" % |
b/snf-django-lib/snf_django/management/utils.py | ||
---|---|---|
171 | 171 |
out.write(title.center(t_length) + "\n") |
172 | 172 |
if headers: |
173 | 173 |
# pretty print the headers |
174 |
line = sep.join(uenc(v.rjust(w))\
|
|
174 |
line = sep.join(uenc(v.rjust(w)) |
|
175 | 175 |
for v, w in zip(headers, widths)) |
176 | 176 |
out.write(line + "\n") |
177 | 177 |
out.write("-" * t_length + "\n") |
Also available in: Unified diff