diff options
| -rw-r--r-- | CHANGELOG.txt | 2 | ||||
| -rw-r--r-- | PKG-INFO | 4 | ||||
| -rw-r--r-- | debian/.git-dpm | 14 | ||||
| -rw-r--r-- | django_tagging.egg-info/PKG-INFO | 4 | ||||
| -rw-r--r-- | docs/index.rst | 5 | ||||
| -rw-r--r-- | tagging/__init__.py | 2 | ||||
| -rw-r--r-- | tagging/templatetags/tagging_tags.py | 8 |
7 files changed, 20 insertions, 19 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 5751870..b41ff9b 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -36,7 +36,7 @@ Version 0.3.1, 22nd January 2010: --------------------------------- * Fixed Django 1.2 support (did not add anything new) -* Fixed #95 — tagging.register won't stomp on model attributes +* Fixed #95 - tagging.register won't stomp on model attributes Version 0.3.0, 22nd August 2009: -------------------------------- @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: django-tagging -Version: 0.4 +Version: 0.4.1 Summary: Generic tagging application for Django Home-page: https://github.com/Fantomas42/django-tagging Author: Fantomas42 @@ -65,7 +65,7 @@ Description: ============== --------------------------------- * Fixed Django 1.2 support (did not add anything new) - * Fixed #95 — tagging.register won't stomp on model attributes + * Fixed #95 - tagging.register won't stomp on model attributes Version 0.3.0, 22nd August 2009: -------------------------------- diff --git a/debian/.git-dpm b/debian/.git-dpm index 9d5569d..cc7645d 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,11 +1,11 @@ # see git-dpm(1) from git-dpm package -d65aa3c3c146b12548a54c894060bce9a8715ad2 -d65aa3c3c146b12548a54c894060bce9a8715ad2 -d65aa3c3c146b12548a54c894060bce9a8715ad2 -d65aa3c3c146b12548a54c894060bce9a8715ad2 -python-django-tagging_0.3.1.orig.tar.gz -f737bff307a21175b0dbacdb7969cd6bfff6f6ea -31531 +d888d155344e1a000fd79b6869fbd5634b1cf2cb +d888d155344e1a000fd79b6869fbd5634b1cf2cb +d888d155344e1a000fd79b6869fbd5634b1cf2cb +d888d155344e1a000fd79b6869fbd5634b1cf2cb +python-django-tagging_0.4.1.orig.tar.gz +8d8e2d219231b77d4b97263dc8cb50c48f974111 +44260 debianTag="debian/%e%v" patchedTag="patched/%e%v" upstreamTag="upstream/%e%u" diff --git a/django_tagging.egg-info/PKG-INFO b/django_tagging.egg-info/PKG-INFO index 577b287..59be396 100644 --- a/django_tagging.egg-info/PKG-INFO +++ b/django_tagging.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: django-tagging -Version: 0.4 +Version: 0.4.1 Summary: Generic tagging application for Django Home-page: https://github.com/Fantomas42/django-tagging Author: Fantomas42 @@ -65,7 +65,7 @@ Description: ============== --------------------------------- * Fixed Django 1.2 support (did not add anything new) - * Fixed #95 — tagging.register won't stomp on model attributes + * Fixed #95 - tagging.register won't stomp on model attributes Version 0.3.0, 22nd August 2009: -------------------------------- diff --git a/docs/index.rst b/docs/index.rst index c73cbe4..5dd2582 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -139,7 +139,7 @@ To register a model, import the ``tagging.registry`` module and call its class Widget(models.Model): name = models.CharField(max_length=50) - tagging.register(Widget) + register(Widget) The following argument is required: @@ -160,7 +160,7 @@ with your model class' definition: See `TagDescriptor`_ below for details about the use of this descriptor. -``tagged_item_manger_attr`` +``tagged_item_manager_attr`` The name of an attribute in the model class which will hold a custom manager for accessing tagged items for the model. Default: ``'tagged'``. @@ -884,3 +884,4 @@ The tag must be an instance of a ``Tag``, not the name of a tag. Example:: {% tagged_objects comedy_tag in tv.Show as comedies %} + diff --git a/tagging/__init__.py b/tagging/__init__.py index 735691d..8e300fd 100644 --- a/tagging/__init__.py +++ b/tagging/__init__.py @@ -1,7 +1,7 @@ """ Django-tagging """ -__version__ = '0.4' +__version__ = '0.4.1' __license__ = 'BSD License' __author__ = 'Jonathan Buchanan' diff --git a/tagging/templatetags/tagging_tags.py b/tagging/templatetags/tagging_tags.py index bd38b30..4e179fb 100644 --- a/tagging/templatetags/tagging_tags.py +++ b/tagging/templatetags/tagging_tags.py @@ -5,7 +5,7 @@ from django.template import Node from django.template import Library from django.template import Variable from django.template import TemplateSyntaxError -from django.db.models import get_model +from django.apps.registry import apps from django.utils.translation import ugettext as _ from tagging.utils import LINEAR @@ -24,7 +24,7 @@ class TagsForModelNode(Node): self.counts = counts def render(self, context): - model = get_model(*self.model.split('.')) + model = apps.get_model(*self.model.split('.')) if model is None: raise TemplateSyntaxError( _('tags_for_model tag was given an invalid model: %s') % @@ -41,7 +41,7 @@ class TagCloudForModelNode(Node): self.kwargs = kwargs def render(self, context): - model = get_model(*self.model.split('.')) + model = apps.get_model(*self.model.split('.')) if model is None: raise TemplateSyntaxError( _('tag_cloud_for_model tag was given an invalid model: %s') % @@ -69,7 +69,7 @@ class TaggedObjectsNode(Node): self.model = model def render(self, context): - model = get_model(*self.model.split('.')) + model = apps.get_model(*self.model.split('.')) if model is None: raise TemplateSyntaxError( _('tagged_objects tag was given an invalid model: %s') % |