Commits

Anonymous committed a07ec18

fixed a bug in serializers

Comments (0)

Files changed (1)

djangorestframework/serializer.py

 
         # serialize each required field 
         for fname in fields:
-            if fname in instance:
-                # finally check for a key 'fname' on the instance
-                obj = instance[fname]
-            elif hasattr(self, smart_str(fname)):
-                # check for a method 'fname' on self first
+            if hasattr(self, smart_str(fname)):
+                # check first for a method 'fname' on self first
                 meth = getattr(self, fname)
                 if inspect.ismethod(meth) and len(inspect.getargspec(meth)[0]) == 2:
                     obj = meth(instance)
+            elif hasattr(instance, '__contains__') and fname in instance:
+                # check for a key 'fname' on the instance
+                obj = instance[fname]
             elif hasattr(instance, smart_str(fname)):
-                # now check for an attribute 'fname' on the instance
+                # finally check for an attribute 'fname' on the instance
                 obj = getattr(instance, fname)
             else:
                 continue
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.