Merge branch 'release/v0.3.5'

Author: Fantomas42

CHANGELOG.txt

@@ -2,6 +2,14 @@
 Django Tagging Changelog
 ========================
 
+Version 0.3.5, 13th May 2015:
+-----------------------------
+
+* Added support for Django 1.8
+* Using migrations to fix syncdb
+* Rename get_query_set to get_queryset
+* Import GenericForeignKey from the new location
+
 Version 0.3.4, 7th November 2014:
 ---------------------------------
 

docs/overview.txt

@@ -19,7 +19,7 @@ Installing an official release
 ------------------------------
 
 Official releases are made available from
-http://code.google.com/p/django-tagging/
+https://pypi.python.org/pypi/django-tagging/
 
 Source distribution
 ~~~~~~~~~~~~~~~~~~~
@@ -45,11 +45,10 @@ Installing the development version
 
 Alternatively, if you'd like to update Django Tagging occasionally to pick
 up the latest bug fixes and enhancements before they make it into an
-official release, perform a `Subversion`_ checkout instead. The following
-command will check the application's development branch out to an
-``tagging-trunk`` directory::
+official release, clone the git repository instead. The following
+command will clone the development branch to ``django-tagging`` directory::
 
-   svn checkout http://django-tagging.googlecode.com/svn/trunk/ tagging-trunk
+   git clone [email protected]:Fantomas42/django-tagging.git
 
 Add the resulting folder to your `PYTHONPATH`_ or symlink (`junction`_,
 if you're on Windows) the ``tagging`` directory inside it into a
@@ -61,25 +60,22 @@ opening a Python interpreter and entering the following commands::
 
    >>> import tagging
    >>> tagging.VERSION
-   (0, 3, 'pre')
+   (0, 3, 4, 'final', 0)
 
 When you want to update your copy of the Django Tagging source code, run
-the command ``svn update`` from within the ``tagging-trunk`` directory.
+the command ``git pull`` from within the ``django-tagging`` directory.
 
 .. caution::
 
    The development version may contain bugs which are not present in the
    release version and introduce backwards-incompatible changes.
 
-   If you're tracking trunk, keep an eye on the `CHANGELOG`_ and the
-   `backwards-incompatible changes wiki page`_ before you update your
-   copy of the source code.
+   If you're tracking git, keep an eye on the `CHANGELOG`_
+   before you update your copy of the source code.
 
-.. _`Subversion`: http://subversion.tigris.org
 .. _`PYTHONPATH`: http://www.python.org/doc/2.5.2/tut/node8.html#SECTION008120000000000000000
 .. _`junction`: http://www.microsoft.com/technet/sysinternals/FileAndDisk/Junction.mspx
-.. _`CHANGELOG`: http://django-tagging.googlecode.com/svn/trunk/CHANGELOG.txt
-.. _`backwards-incompatible changes wiki page`: http://code.google.com/p/django-tagging/wiki/BackwardsIncompatibleChanges
+.. _`CHANGELOG`: https://github.com/Fantomas42/django-tagging/blob/develop/CHANGELOG.txt
 
 Using Django Tagging in your applications
 -----------------------------------------
@@ -206,7 +202,7 @@ A manager for retrieving tags used by a particular model.
 
 Defines the following methods:
 
-* ``get_query_set()`` -- as this method is redefined, any ``QuerySets``
+* ``get_queryset()`` -- as this method is redefined, any ``QuerySets``
   created by this model will be initially restricted to contain the
   distinct tags used by all the model's instances.
 

setup.py

@@ -54,7 +54,7 @@ def fullsplit(path, result=None):
     description = 'Generic tagging application for Django',
     author = 'Jonathan Buchanan',
     author_email = '[email protected]',
-    url = 'https://code.google.com/p/django-tagging/',
+    url = 'https://github.com/Fantomas42/django-tagging',
     packages = packages,
     data_files = data_files,
     classifiers = [

tagging/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (0, 3, 4, "final", 0)
+VERSION = (0, 3, 5, "final", 0)
 
 
 def get_version():

tagging/managers.py

@@ -2,6 +2,8 @@
 Custom managers for Django models registered with the tagging
 application.
 """
+
+import django
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 
@@ -12,11 +14,15 @@ class ModelTagManager(models.Manager):
     """
     A manager for retrieving tags for a particular model.
     """
-    def get_query_set(self):
+    def get_queryset(self):
         ctype = ContentType.objects.get_for_model(self.model)
         return Tag.objects.filter(
             items__content_type__pk=ctype.pk).distinct()
 
+    # TODO: drop this
+    if django.VERSION < (1, 6):
+        get_query_set = get_queryset
+
     def cloud(self, *args, **kwargs):
         return Tag.objects.cloud_for_model(self.model, *args, **kwargs)
 

tagging/migrations/0001_initial.py

@@ -0,0 +1,42 @@
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Tag',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(unique=True, max_length=50, verbose_name='name', db_index=True)),
+            ],
+            options={
+                'ordering': ('name',),
+                'verbose_name': 'tag',
+                'verbose_name_plural': 'tags',
+            },
+        ),
+        migrations.CreateModel(
+            name='TaggedItem',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('object_id', models.PositiveIntegerField(verbose_name='object id', db_index=True)),
+                ('content_type', models.ForeignKey(verbose_name='content type', to='contenttypes.ContentType')),
+                ('tag', models.ForeignKey(related_name='items', verbose_name='tag', to='tagging.Tag')),
+            ],
+            options={
+                'verbose_name': 'tagged item',
+                'verbose_name_plural': 'tagged items',
+            },
+        ),
+        migrations.AlterUniqueTogether(
+            name='taggeditem',
+            unique_together=set([('tag', 'content_type', 'object_id')]),
+        ),
+    ]

tagging/migrations/__init__.py

@@ -5,9 +5,12 @@
 from django.db import connection
 from django.utils.encoding import smart_text
 from django.utils.encoding import python_2_unicode_compatible
-from django.contrib.contenttypes import generic
-from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import ugettext_lazy as _
+from django.contrib.contenttypes.models import ContentType
+try:
+    from django.contrib.contenttypes.fields import GenericForeignKey
+except ImportError:
+    from django.contrib.contenttypes.generic import GenericForeignKey
 
 from . import settings
 from .utils import LOGARITHMIC
@@ -484,7 +487,7 @@ class TaggedItem(models.Model):
     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 = GenericForeignKey('content_type', 'object_id')
 
     objects = TaggedItemManager()