Django

Code

Changeset 4046

Show
Ignore:
Timestamp:
11/06/06 23:01:35 (2 years ago)
Author:
jacob
Message:

Fixed #2894: XML deserializer now correctly handles null primary keys.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/serializers/xml_serializer.py

    r3237 r4046  
    167167        # validation error, but that's expected). 
    168168        RelatedModel = self._get_model_from_node(node, "to") 
    169         return RelatedModel.objects.get(pk=getInnerText(node).strip().encode(self.encoding)) 
     169        # Check if there is a child node named 'None', returning None if so. 
     170        if len(node.childNodes) == 1 and node.childNodes[0].nodeName == 'None': 
     171            return None 
     172        else: 
     173            return RelatedModel.objects.get(pk=getInnerText(node).strip().encode(self.encoding)) 
    170174         
    171175    def _handle_m2m_field_node(self, node):