Merge back of newforms-admin branch with some other minor cleanup for django 1.0 beta 2

git-svn-id: https://django-tagging.googlecode.com/svn/trunk@149 83e7428b-ec2a-0410-86f2-bf466d0e5e72

Author: dougn

docs/overview.txt

@@ -699,7 +699,7 @@ model::
 
 This field will also validate that it has been given a valid list of
 tag names, separated by a single comma, a single space or a comma
-followed by a space, using the ``isTagList`` validator from
+followed by a space, using the ``is_tag_list`` validator from
 ``tagging.validators``.
 
 

tagging/admin.py

@@ -0,0 +1,5 @@
+from django.contrib import admin
+from tagging.models import Tag, TaggedItem
+
+admin.site.register(TaggedItem)
+admin.site.register(Tag)

tagging/fields.py

@@ -8,7 +8,6 @@
 from tagging import settings
 from tagging.models import Tag
 from tagging.utils import edit_string_for_tags
-from tagging.validators import isTagList
 
 class TagField(CharField):
     """
@@ -19,7 +18,6 @@ class TagField(CharField):
     def __init__(self, *args, **kwargs):
         kwargs['max_length'] = kwargs.get('max_length', 255)
         kwargs['blank'] = kwargs.get('blank', True)
-        kwargs['validator_list'] = [isTagList] + kwargs.get('validator_list', [])
         super(TagField, self).__init__(*args, **kwargs)
 
     def contribute_to_class(self, cls, name):

tagging/forms.py

@@ -5,8 +5,19 @@
 from django.utils.translation import ugettext as _
 
 from tagging import settings
+from tagging.models import Tag
+from tagging.validators import is_tag, is_tag_list
 from tagging.utils import parse_tag_input
 
+class AdminTagForm(forms.ModelForm):
+    class Meta:
+        model = Tag
+    
+    def clean_name(self):
+        value = self.cleaned_data["name"]
+        return is_tag(value)
+        
+
 class TagField(forms.CharField):
     """
     A ``CharField`` which validates that its input is a valid list of
@@ -16,8 +27,4 @@ def clean(self, value):
         value = super(TagField, self).clean(value)
         if value == u'':
             return value
-        for tag_name in parse_tag_input(value):
-            if len(tag_name) > settings.MAX_TAG_LENGTH:
-                raise forms.ValidationError(
-                    _('Each tag may be no more than %s characters long.') % settings.MAX_TAG_LENGTH)
-        return value
+        return is_tag_list(value)

tagging/models.py

@@ -16,15 +16,9 @@
 from tagging import settings
 from tagging.utils import calculate_cloud, get_tag_list, get_queryset_and_model, parse_tag_input
 from tagging.utils import LOGARITHMIC
-from tagging.validators import isTag
 
 qn = connection.ops.quote_name
 
-try:
-    from django.db.models.query import parse_lookup
-except ImportError:
-    parse_lookup = None
-
 ############
 # Managers #
 ############
@@ -147,23 +141,10 @@ def usage_for_model(self, model, counts=False, min_count=None, filters=None):
         """
         if filters is None: filters = {}
 
-        if not parse_lookup:
-            # post-queryset-refactor (hand off to usage_for_queryset)
-            queryset = model._default_manager.filter()
-            for f in filters.items():
-                queryset.query.add_filter(f)
-            usage = self.usage_for_queryset(queryset, counts, min_count)
-        else:
-            # pre-queryset-refactor
-            extra_joins = ''
-            extra_criteria = ''
-            params = []
-            if len(filters) > 0:
-                joins, where, params = parse_lookup(filters.items(), model._meta)
-                extra_joins = ' '.join(['%s %s AS %s ON %s' % (join_type, table, alias, condition)
-                                        for (alias, (table, join_type, condition)) in joins.items()])
-                extra_criteria = 'AND %s' % (' AND '.join(where))
-            usage = self._get_usage(model, counts, min_count, extra_joins, extra_criteria, params)
+        queryset = model._default_manager.filter()
+        for f in filters.items():
+            queryset.query.add_filter(f)
+        usage = self.usage_for_queryset(queryset, counts, min_count)
 
         return usage
 
@@ -180,8 +161,6 @@ def usage_for_queryset(self, queryset, counts=False, min_count=None):
         greater than or equal to ``min_count`` will be returned.
         Passing a value for ``min_count`` implies ``counts=True``.
         """
-        if parse_lookup:
-            raise AttributeError("'TagManager.usage_for_queryset' is not compatible with pre-queryset-refactor versions of Django.")
 
         extra_joins = ' '.join(queryset.query.get_from_clause()[0][1:])
         where, params = queryset.query.where.as_sql()
@@ -288,7 +267,7 @@ class TaggedItemManager(models.Manager):
           objects we're interested in, then use the ORM's ``__in``
           lookup to return a ``QuerySet``.
 
-          Once the queryset-refactor branch lands in trunk, this can be
+          now that the queryset-refactor branch is in the trunk, this can be
           tidied up significantly.
     """
     def get_by_model(self, queryset_or_model, tags):
@@ -463,7 +442,7 @@ class Tag(models.Model):
     """
     A tag.
     """
-    name = models.CharField(_('name'), max_length=50, unique=True, db_index=True, validator_list=[isTag])
+    name = models.CharField(_('name'), max_length=50, unique=True, db_index=True)
 
     objects = TagManager()
 
@@ -472,9 +451,6 @@ class Meta:
         verbose_name = _('tag')
         verbose_name_plural = _('tags')
 
-    class Admin:
-        pass
-
     def __unicode__(self):
         return self.name
 
@@ -495,8 +471,5 @@ class Meta:
         verbose_name = _('tagged item')
         verbose_name_plural = _('tagged items')
 
-    class Admin:
-        pass
-
     def __unicode__(self):
         return u'%s [%s]' % (self.object, self.tag)

tagging/tests/tests.py

@@ -8,7 +8,7 @@
 >>> from tagging.tests.models import Article, Link, Perch, Parrot, FormTest
 >>> from tagging.utils import calculate_cloud, get_tag_list, get_tag, parse_tag_input
 >>> from tagging.utils import LINEAR
->>> from tagging.validators import isTagList, isTag
+>>> from tagging.validators import is_tag_list, is_tag
 
 #############
 # Utilities #
@@ -154,18 +154,18 @@
 
 # Validators ##################################################################
 
->>> isTagList('foo qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbn bar', {})
+>>> is_tag_list('foo qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbn bar', {})
 Traceback (most recent call last):
     ...
 ValidationError: [u'Each tag may be no more than 50 characters long.']
 
->>> isTag('"test"', {})
->>> isTag(',test', {})
->>> isTag('f o o', {})
+>>> is_tag('"test"', {})
+>>> is_tag(',test', {})
+>>> is_tag('f o o', {})
 Traceback (most recent call last):
     ...
 ValidationError: [u'Multiple tags were given.']
->>> isTagList('foo qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbn bar', {})
+>>> is_tag_list('foo qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbn bar', {})
 Traceback (most recent call last):
     ...
 ValidationError: [u'Each tag may be no more than 50 characters long.']

tagging/validators.py

@@ -3,28 +3,30 @@
 required for basic ``django.contrib.admin`` application field validation
 until the ``newforms-admin`` branch lands in trunk.
 """
-from django.core.validators import ValidationError
+from django import forms
 from django.utils.translation import ugettext as _
 
 from tagging import settings
 from tagging.utils import parse_tag_input
 
-def isTagList(field_data, all_data):
+def is_tag_list(value):
     """
-    Validates that ``field_data`` is a valid list of tags.
+    Validates that ``value`` is a valid list of tags.
     """
-    for tag_name in parse_tag_input(field_data):
+    for tag_name in parse_tag_input(value):
         if len(tag_name) > settings.MAX_TAG_LENGTH:
-            raise ValidationError(
+            raise forms.ValidationError(
                 _('Each tag may be no more than %s characters long.') % settings.MAX_TAG_LENGTH)
+    return value
 
-def isTag(field_data, all_data):
+def is_tag(value):
     """
-    Validates that ``field_data`` is a valid tag.
+    Validates that ``value`` is a valid tag.
     """
-    tag_names = parse_tag_input(field_data)
+    tag_names = parse_tag_input(value)
     if len(tag_names) > 1:
         raise ValidationError(_('Multiple tags were given.'))
     elif len(tag_names[0]) > settings.MAX_TAG_LENGTH:
-        raise ValidationError(
+        raise forms.ValidationError(
             _('A tag may be no more than %s characters long.') % settings.MAX_TAG_LENGTH)
+    return value