[Python-modules-commits] [django-taggit] 01/03: Imported Upstream version 0.17.3
Michal Cihar
nijel at moszumanska.debian.org
Thu Oct 29 14:10:52 UTC 2015
This is an automated email from the git hooks/post-receive script.
nijel pushed a commit to branch master
in repository django-taggit.
commit a17a61525d5348155158f2f5411a80279b06dd4d
Author: Michal Čihař <nijel at debian.org>
Date: Thu Oct 29 14:43:51 2015 +0100
Imported Upstream version 0.17.3
---
CHANGELOG.txt | 10 +++++++
PKG-INFO | 2 +-
django_taggit.egg-info/PKG-INFO | 2 +-
django_taggit.egg-info/SOURCES.txt | 8 +----
taggit/__init__.py | 2 +-
taggit/managers.py | 58 +++++++++++++++++++++++++++++--------
taggit/migrations/0001_initial.py | 4 +--
taggit/models.py | 3 +-
tests/__init__.pyc | Bin 144 -> 0 bytes
tests/forms.pyc | Bin 2146 -> 0 bytes
tests/migrations/0001_initial.pyc | Bin 8258 -> 0 bytes
tests/migrations/__init__.pyc | Bin 155 -> 0 bytes
tests/models.pyc | Bin 11096 -> 0 bytes
tests/tests.pyc | Bin 31439 -> 0 bytes
tox.ini | 14 +++++++++
15 files changed, 78 insertions(+), 25 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index de6cb80..854abb0 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,16 @@
Changelog
=========
+0.17.3 (2015-10-26)
+~~~~~~~~~~~~~~~~~~~
+ * Silence Django 1.9 warning about on_delete
+ * https://github.com/alex/django-taggit/pull/338
+
+0.17.2 (2015-10-25)
+~~~~~~~~~~~~~~~~~~~
+ * Django 1.9 beta compatibility
+ * https://github.com/alex/django-taggit/pull/352
+
0.17.1 (2015-09-10)
~~~~~~~~~~~~~~~~~~~
* Fix unknown column `object_id` issue with Django 1.6+
diff --git a/PKG-INFO b/PKG-INFO
index 3ec2e15..39a0a00 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: django-taggit
-Version: 0.17.1
+Version: 0.17.3
Summary: django-taggit is a reusable Django application for simple tagging.
Home-page: http://github.com/alex/django-taggit/tree/master
Author: Alex Gaynor
diff --git a/django_taggit.egg-info/PKG-INFO b/django_taggit.egg-info/PKG-INFO
index 3ec2e15..39a0a00 100644
--- a/django_taggit.egg-info/PKG-INFO
+++ b/django_taggit.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: django-taggit
-Version: 0.17.1
+Version: 0.17.3
Summary: django-taggit is a reusable Django application for simple tagging.
Home-page: http://github.com/alex/django-taggit/tree/master
Author: Alex Gaynor
diff --git a/django_taggit.egg-info/SOURCES.txt b/django_taggit.egg-info/SOURCES.txt
index 359f444..559aef3 100644
--- a/django_taggit.egg-info/SOURCES.txt
+++ b/django_taggit.egg-info/SOURCES.txt
@@ -57,14 +57,8 @@ taggit/south_migrations/0001_initial.py
taggit/south_migrations/0002_unique_tagnames.py
taggit/south_migrations/__init__.py
tests/__init__.py
-tests/__init__.pyc
tests/forms.py
-tests/forms.pyc
tests/models.py
-tests/models.pyc
tests/tests.py
-tests/tests.pyc
tests/migrations/0001_initial.py
-tests/migrations/0001_initial.pyc
-tests/migrations/__init__.py
-tests/migrations/__init__.pyc
\ No newline at end of file
+tests/migrations/__init__.py
\ No newline at end of file
diff --git a/taggit/__init__.py b/taggit/__init__.py
index d3c9b69..01433dd 100644
--- a/taggit/__init__.py
+++ b/taggit/__init__.py
@@ -1 +1 @@
-VERSION = (0, 17, 1)
+VERSION = (0, 17, 3)
diff --git a/taggit/managers.py b/taggit/managers.py
index a17c145..9c2f066 100644
--- a/taggit/managers.py
+++ b/taggit/managers.py
@@ -52,7 +52,11 @@ def _model_name(model):
class TaggableRel(ManyToManyRel):
def __init__(self, field, related_name, through, to=None):
- self.to = to
+ # rel.to renamed to rel.model in Django 1.9
+ if VERSION >= (1, 9):
+ self.model = to
+ else:
+ self.to = to
self.related_name = related_name
self.limit_choices_to = {}
self.symmetrical = True
@@ -72,6 +76,8 @@ class ExtraJoinRestriction(object):
"""
An extra restriction used for contenttype restriction in joins.
"""
+ contains_aggregate = False
+
def __init__(self, alias, col, content_types):
self.alias = alias
self.col = col
@@ -232,7 +238,8 @@ class _TaggableManager(models.Manager):
# Can we do this without a second query by using a select_related()
# somehow?
f = _get_field(self.through, lookup_keys[0])
- objs = f.rel.to._default_manager.filter(**{
+ rel_model = f.rel.model if VERSION >= (1, 9) else f.rel.to
+ objs = rel_model._default_manager.filter(**{
"%s__in" % f.rel.field_name: [r["content_object"] for r in qs]
})
for obj in objs:
@@ -321,10 +328,19 @@ class TaggableManager(RelatedField, Field):
kwargs['through'] = self.rel.through
elif not self.rel.through._meta.auto_created:
kwargs['through'] = "%s.%s" % (self.rel.through._meta.app_label, self.rel.through._meta.object_name)
- if isinstance(self.rel.to, six.string_types):
- kwargs['to'] = self.rel.to
+
+ # rel.to renamed to remote_field.model in Django 1.9
+ if VERSION >= (1, 9):
+ if isinstance(self.remote_field.model, six.string_types):
+ kwargs['to'] = self.remote_field.model
+ else:
+ kwargs['to'] = '%s.%s' % (self.remote_field.model._meta.app_label, self.remote_field.model._meta.object_name)
else:
- kwargs['to'] = '%s.%s' % (self.rel.to._meta.app_label, self.rel.to._meta.object_name)
+ if isinstance(self.rel.to, six.string_types):
+ kwargs['to'] = self.rel.to
+ else:
+ kwargs['to'] = '%s.%s' % (self.rel.to._meta.app_label, self.rel.to._meta.object_name)
+
return name, path, args, kwargs
def contribute_to_class(self, cls, name):
@@ -337,10 +353,18 @@ class TaggableManager(RelatedField, Field):
cls._meta.add_field(self)
setattr(cls, name, self)
if not cls._meta.abstract:
- if isinstance(self.rel.to, six.string_types):
- def resolve_related_class(field, model, cls):
- field.rel.to = model
- add_lazy_relation(cls, self, self.rel.to, resolve_related_class)
+ # rel.to renamed to remote_field.model in Django 1.9
+ if VERSION >= (1, 9):
+ if isinstance(self.remote_field.model, six.string_types):
+ def resolve_related_class(field, model, cls):
+ field.remote_field.model = model
+ add_lazy_relation(cls, self, self.remote_field.model, resolve_related_class)
+ else:
+ if isinstance(self.rel.to, six.string_types):
+ def resolve_related_class(field, model, cls):
+ field.rel.to = model
+ add_lazy_relation(cls, self, self.rel.to, resolve_related_class)
+
if isinstance(self.through, six.string_types):
def resolve_related_class(field, model, cls):
self.through = model
@@ -370,8 +394,14 @@ class TaggableManager(RelatedField, Field):
self.use_gfk = (
self.through is None or issubclass(self.through, GenericTaggedItemBase)
)
- if not self.rel.to:
- self.rel.to = self.through._meta.get_field("tag").rel.to
+
+ # rel.to renamed to remote_field.model in Django 1.9
+ if VERSION >= (1, 9):
+ if not self.remote_field.model:
+ self.remote_field.model = self.through._meta.get_field("tag").remote_field.model
+ else:
+ if not self.rel.to:
+ self.rel.to = self.through._meta.get_field("tag").rel.to
if RelatedObject is not None: # Django < 1.8
self.related = RelatedObject(self.through, cls, self)
@@ -417,7 +447,11 @@ class TaggableManager(RelatedField, Field):
return self.model._meta.pk.name
def m2m_reverse_target_field_name(self):
- return self.rel.to._meta.pk.name
+ # rel.to renamed to remote_field.model in Django 1.9
+ if VERSION >= (1, 9):
+ return self.remote_field.model._meta.pk.name
+ else:
+ return self.rel.to._meta.pk.name
def m2m_column_name(self):
if self.use_gfk:
diff --git a/taggit/migrations/0001_initial.py b/taggit/migrations/0001_initial.py
index d8413e4..ed51048 100644
--- a/taggit/migrations/0001_initial.py
+++ b/taggit/migrations/0001_initial.py
@@ -29,8 +29,8 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, help_text='', verbose_name='ID')),
('object_id', models.IntegerField(help_text='', verbose_name='Object id', db_index=True)),
- ('content_type', models.ForeignKey(related_name='taggit_taggeditem_tagged_items', verbose_name='Content type', to='contenttypes.ContentType', help_text='')),
- ('tag', models.ForeignKey(related_name='taggit_taggeditem_items', to='taggit.Tag', help_text='')),
+ ('content_type', models.ForeignKey(related_name='taggit_taggeditem_tagged_items', verbose_name='Content type', to='contenttypes.ContentType', help_text='', on_delete=models.CASCADE)),
+ ('tag', models.ForeignKey(related_name='taggit_taggeditem_items', to='taggit.Tag', help_text='', on_delete=models.CASCADE)),
],
options={
'verbose_name': 'Tagged Item',
diff --git a/taggit/models.py b/taggit/models.py
index 3ea6945..55b4230 100644
--- a/taggit/models.py
+++ b/taggit/models.py
@@ -132,7 +132,7 @@ class ItemBase(models.Model):
class TaggedItemBase(ItemBase):
- tag = models.ForeignKey(Tag, related_name="%(app_label)s_%(class)s_items")
+ tag = models.ForeignKey(Tag, related_name="%(app_label)s_%(class)s_items", on_delete=models.CASCADE)
class Meta:
abstract = True
@@ -155,6 +155,7 @@ class GenericTaggedItemBase(ItemBase):
object_id = models.IntegerField(verbose_name=_('Object id'), db_index=True)
content_type = models.ForeignKey(
ContentType,
+ on_delete=models.CASCADE,
verbose_name=_('Content type'),
related_name="%(app_label)s_%(class)s_tagged_items"
)
diff --git a/tests/__init__.pyc b/tests/__init__.pyc
deleted file mode 100644
index 4ae1c61..0000000
Binary files a/tests/__init__.pyc and /dev/null differ
diff --git a/tests/forms.pyc b/tests/forms.pyc
deleted file mode 100644
index 40bca6a..0000000
Binary files a/tests/forms.pyc and /dev/null differ
diff --git a/tests/migrations/0001_initial.pyc b/tests/migrations/0001_initial.pyc
deleted file mode 100644
index 5857bc3..0000000
Binary files a/tests/migrations/0001_initial.pyc and /dev/null differ
diff --git a/tests/migrations/__init__.pyc b/tests/migrations/__init__.pyc
deleted file mode 100644
index 828706c..0000000
Binary files a/tests/migrations/__init__.pyc and /dev/null differ
diff --git a/tests/models.pyc b/tests/models.pyc
deleted file mode 100644
index c3eafa5..0000000
Binary files a/tests/models.pyc and /dev/null differ
diff --git a/tests/tests.pyc b/tests/tests.pyc
deleted file mode 100644
index 3e7a630..0000000
Binary files a/tests/tests.pyc and /dev/null differ
diff --git a/tox.ini b/tox.ini
index ad6b3df..123c3f1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,8 @@ deps17 =
https://github.com/django/django/archive/stable/1.7.x.tar.gz#egg=django
deps18 =
https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django
+deps19 =
+ https://github.com/django/django/archive/stable/1.9.x.tar.gz#egg=django
commands =
python ./runtests.py {posargs}
@@ -66,6 +68,12 @@ deps =
{[testenv]deps}
{[testenv]deps18}
+[testenv:py27-1.9.x]
+basepython = python2.7
+deps =
+ {[testenv]deps}
+ {[testenv]deps19}
+
[testenv:py33-1.5.x]
basepython = python3.3
deps =
@@ -113,3 +121,9 @@ basepython = python3.4
deps =
{[testenv]deps}
{[testenv]deps18}
+
+[testenv:py34-1.9.x]
+basepython = python3.4
+deps =
+ {[testenv]deps}
+ {[testenv]deps19}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/django-taggit.git
More information about the Python-modules-commits
mailing list