From 27c43c3acc1ca29ff3d380cd2b5722803648a5dd Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Tue, 22 Dec 2009 14:37:26 +0000 Subject: [PATCH] [soc2009/multidb] Whitespace and comment cleanup. Patch from Russell Keith-Magee. git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11949 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/contenttypes/generic.py | 1 + django/contrib/localflavor/us/models.py | 1 + django/contrib/sessions/backends/db.py | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py index 8f3db698e7..66fa9e6013 100644 --- a/django/contrib/contenttypes/generic.py +++ b/django/contrib/contenttypes/generic.py @@ -205,6 +205,7 @@ class ReverseGenericRelatedObjectsDescriptor(object): content_type_field_name = self.field.content_type_field_name, object_id_field_name = self.field.object_id_field_name ) + return manager def __set__(self, instance, value): diff --git a/django/contrib/localflavor/us/models.py b/django/contrib/localflavor/us/models.py index 6ce6d3bec7..4cb6e6851e 100644 --- a/django/contrib/localflavor/us/models.py +++ b/django/contrib/localflavor/us/models.py @@ -30,3 +30,4 @@ class PhoneNumberField(Field): defaults = {'form_class': USPhoneNumberField} defaults.update(kwargs) return super(PhoneNumberField, self).formfield(**defaults) + diff --git a/django/contrib/sessions/backends/db.py b/django/contrib/sessions/backends/db.py index 4ece18ca37..8a53125095 100644 --- a/django/contrib/sessions/backends/db.py +++ b/django/contrib/sessions/backends/db.py @@ -58,7 +58,6 @@ class SessionStore(SessionBase): session_data = self.encode(self._get_session(no_load=must_create)), expire_date = self.get_expiry_date() ) - # TODO update for multidb sid = transaction.savepoint(using=self.using) try: obj.save(force_insert=must_create)