[Python-modules-commits] r17858 - in packages/python-django-feincms/trunk/debian (3 files)

[janos-guest at users.alioth.debian.org]

    Date: Friday, July 15, 2011 @ 16:40:02
  Author: janos-guest
Revision: 17858

633970

Added:
  packages/python-django-feincms/trunk/debian/patches/fix-tagging-import.patch
Modified:
  packages/python-django-feincms/trunk/debian/changelog
  packages/python-django-feincms/trunk/debian/patches/series

Modified: packages/python-django-feincms/trunk/debian/changelog
===================================================================
--- packages/python-django-feincms/trunk/debian/changelog	2011-07-15 03:05:56 UTC (rev 17857)
+++ packages/python-django-feincms/trunk/debian/changelog	2011-07-15 16:40:02 UTC (rev 17858)
@@ -1,3 +1,9 @@
+python-django-feincms (1.3.0~dfsg-2) unstable; urgency=low
+
+  * Fix conflicting imports in feincms/contrib/tagging.py (Closes: #633970) 
+
+ -- Janos Guljas <janos at resenje.org>  Fri, 15 Jul 2011 18:33:12 +0200
+
 python-django-feincms (1.3.0~dfsg-1) unstable; urgency=low
 
   * Initial release. (Closes: #611048)

Added: packages/python-django-feincms/trunk/debian/patches/fix-tagging-import.patch
===================================================================
--- packages/python-django-feincms/trunk/debian/patches/fix-tagging-import.patch	                        (rev 0)
+++ packages/python-django-feincms/trunk/debian/patches/fix-tagging-import.patch	2011-07-15 16:40:02 UTC (rev 17858)
@@ -0,0 +1,52 @@
+Description: Fix conflicting imports in feincms/contrib/tagging.py module
+Author: Janos Guljas <janos at resenje.org>
+Last-Update: 2011-07-15
+
+--- a/feincms/contrib/tagging.py
++++ b/feincms/contrib/tagging.py
+@@ -7,12 +7,13 @@
+ #    from feincms.contrib import tagging
+ #    tagging.tag_model(Page)
+ # ------------------------------------------------------------------------
++__package__ = 'feincms.contrib.tagging'
+ 
+ from django.db.models.signals import pre_save
+ from django import forms
+ from django.contrib.admin.widgets import FilteredSelectMultiple
+ 
+-from ..tagging.fields import TagField
++from tagging.fields import TagField
+ 
+ # ------------------------------------------------------------------------
+ def taglist_to_string(taglist):
+@@ -48,8 +49,8 @@ class TagSelectField(TagField):
+         self.filter_horizontal = filter_horizontal
+ 
+     def formfield(self, **defaults):
+-        from ..tagging.models import Tag, TaggedItem
+-        from ..tagging.utils import parse_tag_input
++        from tagging.models import Tag, TaggedItem
++        from tagging.utils import parse_tag_input
+ 
+         if self.filter_horizontal:
+             widget = FilteredSelectMultiple(self.verbose_name, is_stacked=False)
+@@ -70,7 +71,7 @@ def pre_save_handler(sender, instance, *
+     Intercept attempts to save and sort the tag field alphabetically, so
+     we won't have different permutations in the filter list.
+     """
+-    from ..tagging.utils import parse_tag_input
++    from tagging.utils import parse_tag_input
+ 
+     taglist = parse_tag_input(instance.tags)
+     instance.tags = taglist_to_string(taglist)
+@@ -92,8 +93,8 @@ def tag_model(cls, admin_cls=None, field
+     select_field If True, show a multi select instead of the standard
+                 CharField for tag entry.
+     """
+-    from ..tagging.fields import TagField
+-    from ..tagging import register as tagging_register
++    from tagging.fields import TagField
++    from tagging import register as tagging_register
+ 
+     cls.add_to_class(field_name, (select_field and TagSelectField or TagField)(field_name.capitalize(), blank=True))
+     # use another name for the tag descriptor

Modified: packages/python-django-feincms/trunk/debian/patches/series
===================================================================
--- packages/python-django-feincms/trunk/debian/patches/series	2011-07-15 03:05:56 UTC (rev 17857)
+++ packages/python-django-feincms/trunk/debian/patches/series	2011-07-15 16:40:02 UTC (rev 17858)
@@ -1 +1,2 @@
 fix-sphinx-comment.patch
+fix-tagging-import.patch