django-restit 4.1.39__py3-none-any.whl → 4.1.40__py3-none-any.whl

{django_restit-4.1.39.dist-info → django_restit-4.1.40.dist-info}/METADATA

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

{django_restit-4.1.39.dist-info → django_restit-4.1.40.dist-info}/RECORD

@@ -343,7 +343,7 @@ pushit/utils.py,sha256=IeTCGa-164nmB1jIsK1lu1O1QzUhS3BKfuXHGjCW-ck,2121
 rest/.gitignore,sha256=TbEvWRMnAiajCTOdhiNrd9eeCAaIjRp9PRjE_VkMM5g,118
 rest/README.md,sha256=V3ETc-cJu8PZIbKr9xSe_pA4JEUpC8Dhw4bQeVCDJPw,5460
 rest/RemoteEvents.py,sha256=nL46U7AuxIrlw2JunphR1tsXyqi-ep_gD9CYGpYbNgE,72
-rest/__init__.py,sha256=WCk9nGwCFbBQVug3zr3M079Ai-Et6ZKbfVT4QHH04Tg,121
+rest/__init__.py,sha256=qEmZBxIJWeZCVLWbDDx_XIDFv831Xv6nqEGRAnU33JA,121
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -385,10 +385,10 @@ rest/rpc.py,sha256=8n6LdtUyLqpwvdH1dtVT1e2ODYxOj1CEYs8mm_-vqwA,3612
 rest/search.py,sha256=UPnUldROiq65KmnEn-FIsgnpxk0wcXVu7I2NGfB7A-Q,7645
 rest/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rest/serializers/collection.py,sha256=7vDmuz6alautQVr9VsVCFQdQdJcZR9tkrOEs2b_mKQw,2015
-rest/serializers/csv.py,sha256=nae_SIIpDH7HReErjNacVxEujzTvJqQxHd29BY-RXh0,2975
+rest/serializers/csv.py,sha256=CVD0erB2Ebl7mqgrMAZ2FxZSZpyVDCoSS4FHiEjuvDM,3252
 rest/serializers/excel.py,sha256=KtxqZZU5Huzo31tyVVWbshMudeSAImKLO71ufQQt0-c,1077
 rest/serializers/json.py,sha256=R1has2PZQuXacA6WwfdrBnMG4rSM6CrnXQOhGoAU6Dk,1736
-rest/serializers/legacy.py,sha256=AhwXFZQQ2XedV5ztQiHPbDRkd4vDX1iTejZrHH-r5Gs,61795
+rest/serializers/legacy.py,sha256=LgU8Sr7yFoiOso1Tb-LkJ-vphGcbEc4BKuSCCuD62R8,61800
 rest/serializers/model.py,sha256=kbwtREE--n7YKUfTzErfYhHsgiuqnLdS52z1owrXaQI,7532
 rest/serializers/profiler.py,sha256=OxOimhEyvCAuzUBC9Q1dz2xaakjAqmSnekMATsjduXM,997
 rest/serializers/response.py,sha256=8PtxZznl8E_OQbCA1epIHcMxSJJYf9VOW_syXh19nz4,6509
@@ -474,7 +474,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.1.39.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.1.39.dist-info/METADATA,sha256=ufCEq9L9tZDuAUoEGIpYsosJQfxGQHMjg4LeS0cFDVQ,7573
-django_restit-4.1.39.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.1.39.dist-info/RECORD,,
+django_restit-4.1.40.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.1.40.dist-info/METADATA,sha256=Sm4DNuvkHqUeY2ZqBYmql_qo9BrmwWxp6Usuj02yjAU,7573
+django_restit-4.1.40.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.1.40.dist-info/RECORD,,

rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.1.39"
+__version__ = "4.1.40"

rest/serializers/csv.py

@@ -5,38 +5,42 @@ import csv
 
 
 def flattenObject(obj, field_names):
-    NOT_FOUND = "-!@#$%^&*()-"
-
     row = []
     for f in field_names:
-        d = getattr(obj, f, NOT_FOUND)
-        if d != NOT_FOUND:
-            if callable(d):
-                d = d()
-        elif "." in f:
-            f1, f2 = f.split('.')
-            d1 = getattr(obj, f1, None)
-            if d1:
-                if not hasattr(d1, f2):
-                    if hasattr(d1, "first"):
-                        d1 = d1.first()
-                d = getattr(d1, f2, "")
+        d = ""
+        if "__" in f:
+            f = f.replace("__", ".")
+        if "." in f:
+            # we could use obj.getFieldValue
+            keys = f.split('.')
+            f1 = keys[0]
+            f2 = keys[1]
+            if f1 == "metadata" and hasattr(obj, "getProperty"): 
+                if len(keys) > 2:
+                    d = obj.getProperty(f2, category=keys[2])
+                else:
+                    d = obj.getProperty(f2)
+            elif hasattr(obj, "getFieldValue"):
+                d = obj.getFieldValue(f, "t/a")
                 if callable(d):
                     d = d()
             else:
-                d = ""
-        elif "__" in f:
-            f1, f2 = f.split('__')
-            d1 = getattr(obj, f1, None)
-            if d1:
-                if not hasattr(d1, f2):
-                    if hasattr(d1, "first"):
-                        d1 = d1.first()
-                d = getattr(d1, f2, "")
-            else:
-                d = ""
+                d1 = getattr(obj, f1, None)
+                if d1 is not None:
+                    if not hasattr(d1, f2):
+                        if hasattr(d1, "first"):
+                            d1 = d1.first()
+                    d = getattr(d1, f2, "")
+                    if callable(d):
+                        d = d()                
         else:
+            d = getattr(obj, f, "n/a")
+            if callable(d):
+                d = d()
+        if d is None:
             d = "n/a"
+        elif hasattr(d, "pk"):
+            d = d.pk
         row.append(str(d))
     return row
 

rest/serializers/legacy.py

@@ -226,6 +226,7 @@ class RawQuery(object):
             sql += " OFFSET %d" % self.offset
 
         return sql + ";"
+    
     def run(self):
         return self.model.objects.raw(self.sql())