From ddae2ecfe42a4135850a435e1eefc79dfecaa062 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Tue, 29 May 2007 13:09:48 +0000 Subject: unicode: Merged from trunk up to [5380]. git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5381 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/context_processors.py | 7 +++++++ django/core/management.py | 2 +- django/core/serializers/python.py | 7 ++++++- django/core/serializers/xml_serializer.py | 8 +++++++- 4 files changed, 21 insertions(+), 3 deletions(-) (limited to 'django/core') diff --git a/django/core/context_processors.py b/django/core/context_processors.py index f4b288dfc4..3c826b1a7d 100644 --- a/django/core/context_processors.py +++ b/django/core/context_processors.py @@ -42,6 +42,13 @@ def i18n(request): return context_extras +def media(request): + """ + Adds media-related context variables to the context. + + """ + return {'MEDIA_URL': settings.MEDIA_URL} + def request(request): return {'request': request} diff --git a/django/core/management.py b/django/core/management.py index e8e09e928a..a926f683db 100644 --- a/django/core/management.py +++ b/django/core/management.py @@ -1138,7 +1138,7 @@ def validate(outfile=sys.stdout, silent_success=False): return outfile.write('%s error%s found.\n' % (num_errors, num_errors != 1 and 's' or '')) except ImproperlyConfigured: - outfile.write("Skipping validation because things aren't configured properly.") + outfile.write("Skipping validation because things aren't configured properly.\n") validate.args = '' def _check_for_validation_errors(app=None): diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py index 2eb2beeb48..c0d2efab50 100644 --- a/django/core/serializers/python.py +++ b/django/core/serializers/python.py @@ -38,7 +38,12 @@ class Serializer(base.Serializer): def handle_fk_field(self, obj, field): related = getattr(obj, field.name) if related is not None: - related = getattr(related, field.rel.field_name) + if field.rel.field_name == related._meta.pk.name: + # Related to remote object via primary key + related = related._get_pk_val() + else: + # Related to remote object via other field + related = getattr(related, field.rel.field_name) self._current[field.name] = related def handle_m2m_field(self, obj, field): diff --git a/django/core/serializers/xml_serializer.py b/django/core/serializers/xml_serializer.py index 35f18a8589..50bce929b3 100644 --- a/django/core/serializers/xml_serializer.py +++ b/django/core/serializers/xml_serializer.py @@ -83,7 +83,13 @@ class Serializer(base.Serializer): self._start_relational_field(field) related = getattr(obj, field.name) if related is not None: - self.xml.characters(smart_unicode(getattr(related, field.rel.field_name))) + if field.rel.field_name == related._meta.pk.name: + # Related to remote object via primary key + related = related._get_pk_val() + else: + # Related to remote object via other field + related = getattr(related, field.rel.field_name) + self.xml.characters(smart_unicode(related)) else: self.xml.addQuickElement("None") self.xml.endElement("field") -- cgit v1.3