django-restit 4.2.70__py3-none-any.whl → 4.2.71__py3-none-any.whl

{django_restit-4.2.70.dist-info → django_restit-4.2.71.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.2.70
+Version: 4.2.71
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.2.70.dist-info → django_restit-4.2.71.dist-info}/RECORD

@@ -400,7 +400,7 @@ rest/middleware/request.py,sha256=JchRNy5L-bGd-7h-KFYekGRvREe2eCkZXKOYqIkP2hI,41
 rest/middleware/session.py,sha256=zHSoQpIzRLmpqr_JvW406wzpvU3W3gDbm5JhtzLAMlE,10240
 rest/middleware/session_store.py,sha256=1nSdeXK8PyuYgGgIufqrS6j6QpIrQ7zbMNT0ol75e6U,1901
 rest/models/__init__.py,sha256=M8pvFDq-WCF-QcM58X7pMufYYe0aaQ3U0PwGe9TKbbY,130
-rest/models/base.py,sha256=S6lLCPPEUQRVHn_4S2TwAVSQisdlKz3kqKI4dRKWUBY,67650
+rest/models/base.py,sha256=YHGP978FmcXIPiyrdZKVskVdEtsy84zF10LEfdErdp0,67771
 rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
 rest/models/metadata.py,sha256=65GvfFbc26_7wJz8qEAzU7fEOZWVz0ttO5j5m_gs4hk,12860
 rest/net.py,sha256=LcB2QV6VNRtsSdmiQvYZgwQUDwOPMn_VBdRiZ6OpI-I,2974
@@ -501,7 +501,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.70.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.70.dist-info/METADATA,sha256=ET_WVOOaFH2K9I4UrGI50an2pN7DZ4a1pZ0Y4ZKHv8g,7645
-django_restit-4.2.70.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.70.dist-info/RECORD,,
+django_restit-4.2.71.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.71.dist-info/METADATA,sha256=r7l9ZtyTLPW9I9XeXySkV-ElGFx6wgF92U2BIf4PbNw,7645
+django_restit-4.2.71.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.71.dist-info/RECORD,,

rest/models/base.py

@@ -1084,7 +1084,10 @@ class RestModel(object):
             localize = request.DATA.get("localize", None, field_type=dict)
             rh.debug("localize", localize)
             if name is None:
-                name = "{}.{}".format(cls.get_class_name(), format)
+                ext = format
+                if "_" in ext:
+                    ext = ext[:ext.find("_")]
+                name = "{}.{}".format(cls.get_class_name(), ext)
             # print "csv size: {}".format(qset.count())
             sort = request.DATA.get("sort", getattr(cls.RestMeta, "DEFAULT_SORT", "-id"))
             sort_args = cls.getSortArgs(sort)
@@ -1094,11 +1097,11 @@ class RestModel(object):
                 except Exception:
                     pass
             cls._boundRest()
-            if format == "json":
+            if format.startswith("json"):
                 return GRAPH_HELPERS.views.restJSON(
                     request, qset, fields, 
                     name, format_size, localize=localize)
-            elif format == "csv":
+            elif format.startswith("csv"):
                 return GRAPH_HELPERS.views.restCSV(
                     request, qset, fields,
                     name, format_size, localize=localize)