diff options
| author | Dan McGee <dan@archlinux.org> | 2014-10-21 09:11:48 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2014-10-21 09:40:14 -0500 |
| commit | 087b4b00031fed52eeddf05ae36825cb498680f0 (patch) | |
| tree | d322b4d452c0d09827095960e38fac449cabc307 | |
| parent | ee6bf2782068b917232c71189aea0011b47e876d (diff) | |
Remove queryset specialization in JSON encoder
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | mirrors/views.py | 5 | ||||
| -rw-r--r-- | releng/views.py | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/mirrors/views.py b/mirrors/views.py index 0bf0a267..1a9741ed 100644 --- a/mirrors/views.py +++ b/mirrors/views.py @@ -323,9 +323,6 @@ class LocationJSONEncoder(DjangoJSONEncoder): '''Base JSONEncoder extended to handle CheckLocation objects.''' def default(self, obj): - if hasattr(obj, '__iter__'): - # mainly for queryset serialization - return list(obj) if isinstance(obj, CheckLocation): return { 'id': obj.pk, @@ -341,7 +338,7 @@ class LocationJSONEncoder(DjangoJSONEncoder): def locations_json(request): data = {} data['version'] = 1 - data['locations'] = CheckLocation.objects.all().order_by('pk') + data['locations'] = list(CheckLocation.objects.all().order_by('pk')) to_json = json.dumps(data, ensure_ascii=False, cls=LocationJSONEncoder) response = HttpResponse(to_json, content_type='application/json') return response diff --git a/releng/views.py b/releng/views.py index ef81a65c..dbb65c2e 100644 --- a/releng/views.py +++ b/releng/views.py @@ -247,9 +247,6 @@ class ReleaseJSONEncoder(DjangoJSONEncoder): 'created', 'md5_sum', 'sha1_sum') def default(self, obj): - if hasattr(obj, '__iter__'): - # mainly for queryset serialization - return list(obj) if isinstance(obj, Release): data = {attr: getattr(obj, attr) or None for attr in self.release_attributes} @@ -276,7 +273,7 @@ def releases_json(request): data = { 'version': 1, - 'releases': releases, + 'releases': list(releases), 'latest_version': latest_version, } to_json = json.dumps(data, ensure_ascii=False, cls=ReleaseJSONEncoder) |