Revert "Fixed issue #28 — properly update TagField tag instance cache when loading the object to keep everything in sync. Thanks ebartels and carljm for the legwork."

This reverts commit 1e829d4.

Conflicts:

	tagging/fields.py
	tagging/tests/models.py
	tagging/tests/tests.py

Author: Fantomas42

tagging/fields.py

@@ -19,7 +19,6 @@ class TagField(CharField):
     def __init__(self, *args, **kwargs):
         kwargs['max_length'] = kwargs.get('max_length', 255)
         kwargs['blank'] = kwargs.get('blank', True)
-        kwargs['default'] = kwargs.get('default', '')
         super(TagField, self).__init__(*args, **kwargs)
 
     def contribute_to_class(self, cls, name):
@@ -31,9 +30,6 @@ def contribute_to_class(self, cls, name):
         # Save tags back to the database post-save
         signals.post_save.connect(self._save, cls, True)
 
-        # Update tags from Tag objects post-init
-        signals.post_init.connect(self._update, cls, True)
-
     def __get__(self, instance, owner=None):
         """
         Tag getter. Returns an instance's tags if accessed on an instance, and
@@ -57,6 +53,13 @@ class Link(models.Model):
         if instance is None:
             return edit_string_for_tags(Tag.objects.usage_for_model(owner))
 
+        tags = self._get_instance_tag_cache(instance)
+        if tags is None:
+            if instance.pk is None:
+                self._set_instance_tag_cache(instance, '')
+            else:
+                self._set_instance_tag_cache(
+                    instance, edit_string_for_tags(Tag.objects.get_for_object(instance)))
         return self._get_instance_tag_cache(instance)
 
     def __set__(self, instance, value):
@@ -74,14 +77,8 @@ def _save(self, **kwargs):  # signal, sender, instance):
         Save tags back to the database
         """
         tags = self._get_instance_tag_cache(kwargs['instance'])
-        Tag.objects.update_tags(kwargs['instance'], tags)
-
-    def _update(self, **kwargs):  # signal, sender, instance):
-        """
-        Update tag cache from TaggedItem objects.
-        """
-        instance = kwargs['instance']
-        self._update_instance_tag_cache(instance)
+        if tags is not None:
+            Tag.objects.update_tags(kwargs['instance'], tags)
 
     def __delete__(self, instance):
         """
@@ -101,15 +98,6 @@ def _set_instance_tag_cache(self, instance, tags):
         """
         setattr(instance, '_%s_cache' % self.attname, tags)
 
-    def _update_instance_tag_cache(self, instance):
-        """
-        Helper: update an instance's tag cache from actual Tags.
-        """
-        # for an unsaved object, leave the default value alone
-        if instance.pk is not None:
-            tags = edit_string_for_tags(Tag.objects.get_for_object(instance))
-            self._set_instance_tag_cache(instance, tags)
-
     def get_internal_type(self):
         return 'CharField'
 

tagging/tests/tests.py

@@ -10,7 +10,7 @@
 from tagging import settings
 from tagging.forms import TagField
 from tagging.models import Tag, TaggedItem
-from tagging.tests.models import Article, Link, Perch, Parrot, FormTest, FormTestNull
+from tagging.tests.models import Article, Link, Perch, Parrot, FormTest
 from tagging.utils import calculate_cloud, edit_string_for_tags, get_tag_list, get_tag, parse_tag_input
 from tagging.utils import LINEAR