Ported everything else over plus linted + pep8ed.

Author: jefftriplett

tagging/admin.py

@@ -1,13 +1,12 @@
 from django.contrib import admin
-from tagging.models import Tag, TaggedItem
-from tagging.forms import TagAdminForm
+
+from .models import Tag, TaggedItem
+from .forms import TagAdminForm
+
 
 class TagAdmin(admin.ModelAdmin):
     form = TagAdminForm
 
+
 admin.site.register(TaggedItem)
 admin.site.register(Tag, TagAdmin)
-
-
-
-

tagging/fields.py

@@ -5,9 +5,10 @@
 from django.db.models.fields import CharField
 from django.utils.translation import ugettext_lazy as _
 
-from tagging import settings
-from tagging.models import Tag
-from tagging.utils import edit_string_for_tags
+from . import settings
+from .models import Tag
+from .utils import edit_string_for_tags
+
 
 class TagField(CharField):
     """
@@ -68,14 +69,14 @@ def __set__(self, instance, value):
             value = value.lower()
         self._set_instance_tag_cache(instance, value)
 
-    def _save(self, **kwargs): #signal, sender, instance):
+    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):
+    def _update(self, **kwargs):  # signal, sender, instance):
         """
         Update tag cache from TaggedItem objects.
         """

tagging/forms.py

@@ -4,9 +4,10 @@
 from django import forms
 from django.utils.translation import ugettext as _
 
-from tagging import settings
-from tagging.models import Tag
-from tagging.utils import parse_tag_input
+from . import settings
+from .models import Tag
+from .utils import parse_tag_input
+
 
 class TagAdminForm(forms.ModelForm):
     class Meta:
@@ -23,6 +24,7 @@ def clean_name(self):
                     settings.MAX_TAG_LENGTH)
         return value
 
+
 class TagField(forms.CharField):
     """
     A ``CharField`` which validates that its input is a valid list of

tagging/generic.py

@@ -1,5 +1,6 @@
 from django.contrib.contenttypes.models import ContentType
 
+
 def fetch_content_objects(tagged_items, select_related_for=None):
     """
     Retrieves ``ContentType`` and content objects for the given list of
@@ -15,7 +16,8 @@ def fetch_content_objects(tagged_items, select_related_for=None):
     ``ContentType``) for which ``select_related`` should be used when
     retrieving model instances.
     """
-    if select_related_for is None: select_related_for = []
+    if select_related_for is None:
+        select_related_for = []
 
     # Group content object pks by their content type pks
     objects = {}

tagging/managers.py

@@ -5,7 +5,8 @@
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 
-from tagging.models import Tag, TaggedItem
+from .models import Tag, TaggedItem
+
 
 class ModelTagManager(models.Manager):
     """
@@ -25,6 +26,7 @@ def related(self, tags, *args, **kwargs):
     def usage(self, *args, **kwargs):
         return Tag.objects.usage_for_model(self.model, *args, **kwargs)
 
+
 class ModelTaggedItemManager(models.Manager):
     """
     A manager for retrieving model instances based on their tags.
@@ -47,6 +49,7 @@ def with_any(self, tags, queryset=None):
         else:
             return TaggedItem.objects.get_union_by_model(queryset, tags)
 
+
 class TagDescriptor(object):
     """
     A descriptor which provides access to a ``ModelTagManager`` for

tagging/models.py

@@ -1,24 +1,20 @@
 """
 Models and managers for generic tagging.
 """
-# Python 2.3 compatibility
-try:
-    set
-except NameError:
-    from sets import Set as set
-
 from django.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
 from django.db import connection, models
-from django.db.models.query import QuerySet
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
-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 . import settings
+from .utils import (calculate_cloud, get_tag_list, get_queryset_and_model,
+    parse_tag_input, LOGARITHMIC)
+
 
 qn = connection.ops.quote_name
 
+
 ############
 # Managers #
 ############
@@ -449,10 +445,12 @@ def get_related(self, obj, queryset_or_model, num=None):
         else:
             return []
 
+
 ##########
 # Models #
 ##########
 
+@python_2_unicode_compatible
 class Tag(models.Model):
     """
     A tag.
@@ -466,17 +464,19 @@ class Meta:
         verbose_name = _('tag')
         verbose_name_plural = _('tags')
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
+
+@python_2_unicode_compatible
 class TaggedItem(models.Model):
     """
     Holds the relationship between a tag and the item being tagged.
     """
-    tag          = models.ForeignKey(Tag, verbose_name=_('tag'), related_name='items')
+    tag = models.ForeignKey(Tag, verbose_name=_('tag'), related_name='items')
     content_type = models.ForeignKey(ContentType, verbose_name=_('content type'))
-    object_id    = models.PositiveIntegerField(_('object id'), db_index=True)
-    object       = generic.GenericForeignKey('content_type', 'object_id')
+    object_id = models.PositiveIntegerField(_('object id'), db_index=True)
+    object = generic.GenericForeignKey('content_type', 'object_id')
 
     objects = TaggedItemManager()
 
@@ -486,5 +486,5 @@ class Meta:
         verbose_name = _('tagged item')
         verbose_name_plural = _('tagged items')
 
-    def __unicode__(self):
-        return u'%s [%s]' % (self.object, self.tag)
+    def __str__(self):
+        return '%s [%s]' % (self.object, self.tag)

tagging/templatetags/tagging_tags.py

@@ -1,12 +1,14 @@
 from django.db.models import get_model
-from django.template import Library, Node, TemplateSyntaxError, Variable, resolve_variable
+from django.template import Library, Node, TemplateSyntaxError, Variable
 from django.utils.translation import ugettext as _
 
-from tagging.models import Tag, TaggedItem
-from tagging.utils import LINEAR, LOGARITHMIC
+from ..models import Tag, TaggedItem
+from ..utils import LINEAR, LOGARITHMIC
+
 
 register = Library()
 
+
 class TagsForModelNode(Node):
     def __init__(self, model, context_var, counts):
         self.model = model
@@ -20,6 +22,7 @@ def render(self, context):
         context[self.context_var] = Tag.objects.usage_for_model(model, counts=self.counts)
         return ''
 
+
 class TagCloudForModelNode(Node):
     def __init__(self, model, context_var, **kwargs):
         self.model = model
@@ -34,6 +37,7 @@ def render(self, context):
             Tag.objects.cloud_for_model(model, **self.kwargs)
         return ''
 
+
 class TagsForObjectNode(Node):
     def __init__(self, obj, context_var):
         self.obj = Variable(obj)
@@ -44,6 +48,7 @@ def render(self, context):
             Tag.objects.get_for_object(self.obj.resolve(context))
         return ''
 
+
 class TaggedObjectsNode(Node):
     def __init__(self, tag, model, context_var):
         self.tag = Variable(tag)
@@ -58,6 +63,7 @@ def render(self, context):
             TaggedItem.objects.get_by_model(model, self.tag.resolve(context))
         return ''
 
+
 def do_tags_for_model(parser, token):
     """
     Retrieves a list of ``Tag`` objects associated with a given model
@@ -99,6 +105,7 @@ def do_tags_for_model(parser, token):
     else:
         return TagsForModelNode(bits[1], bits[3], counts=True)
 
+
 def do_tag_cloud_for_model(parser, token):
     """
     Retrieves a list of ``Tag`` objects for a given model, with tag
@@ -178,6 +185,7 @@ def do_tag_cloud_for_model(parser, token):
                 })
     return TagCloudForModelNode(bits[1], bits[3], **kwargs)
 
+
 def do_tags_for_object(parser, token):
     """
     Retrieves a list of ``Tag`` objects associated with an object and
@@ -198,6 +206,7 @@ def do_tags_for_object(parser, token):
         raise TemplateSyntaxError(_("second argument to %s tag must be 'as'") % bits[0])
     return TagsForObjectNode(bits[1], bits[3])
 
+
 def do_tagged_objects(parser, token):
     """
     Retrieves a list of instances of a given model which are tagged with
@@ -225,6 +234,7 @@ def do_tagged_objects(parser, token):
         raise TemplateSyntaxError(_("fourth argument to %s tag must be 'as'") % bits[0])
     return TaggedObjectsNode(bits[1], bits[3], bits[5])
 
+
 register.tag('tags_for_model', do_tags_for_model)
 register.tag('tag_cloud_for_model', do_tag_cloud_for_model)
 register.tag('tags_for_object', do_tags_for_object)

tagging/tests/models.py

@@ -1,42 +1,54 @@
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 from tagging.fields import TagField
 
+
+@python_2_unicode_compatible
 class Perch(models.Model):
     size = models.IntegerField()
     smelly = models.BooleanField(default=True)
 
+
+@python_2_unicode_compatible
 class Parrot(models.Model):
     state = models.CharField(max_length=50)
     perch = models.ForeignKey(Perch, null=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.state
 
     class Meta:
         ordering = ['state']
 
+
+@python_2_unicode_compatible
 class Link(models.Model):
     name = models.CharField(max_length=50)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     class Meta:
         ordering = ['name']
 
+
+@python_2_unicode_compatible
 class Article(models.Model):
     name = models.CharField(max_length=50)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     class Meta:
         ordering = ['name']
 
+
+@python_2_unicode_compatible
 class FormTest(models.Model):
     tags = TagField('Test', help_text='Test')
 
+
+@python_2_unicode_compatible
 class FormTestNull(models.Model):
     tags = TagField(null=True)
-