# HG changeset patch
# User grandjoncl
# Date 1350650942 -7200
# Node ID 2ade832d146239bf9f24105a93cf7abb023f3daa
# Parent  534c13786e89d503fd4f1c222dcc2ff37fd086d2# Parent  429ab4f4b82347c3ba4ca0ac36d854ac1715a190
Merge with 429ab4f4b82347c3ba4ca0ac36d854ac1715a190

diff -r 534c13786e89 -r 2ade832d1462 .hgtags
--- a/.hgtags	Fri Oct 19 14:47:27 2012 +0200
+++ b/.hgtags	Fri Oct 19 14:49:02 2012 +0200
@@ -108,3 +108,7 @@
 626573ed450f361c429b5208011f4285b689646f V01.23
 f8bd692229d72085d262dbaf5708b0fb555d9b95 V01.24
 96b7309ae220055ec844eb047513828842883fbe V01.25
+36d8d68fda811a9020dfcb4794ad42403ab7806b V01.26
+36d8d68fda811a9020dfcb4794ad42403ab7806b V01.26
+3eae57bb42b3d5c8daf3e94331f9ef30cf444693 V01.26
+2151b47c58c3291f82a2e190c474e7f616266742 V01.27
diff -r 534c13786e89 -r 2ade832d1462 src/ldt/ldt/__init__.py
--- a/src/ldt/ldt/__init__.py	Fri Oct 19 14:47:27 2012 +0200
+++ b/src/ldt/ldt/__init__.py	Fri Oct 19 14:49:02 2012 +0200
@@ -1,4 +1,4 @@
-VERSION = (1, 25, 0, "final", 0)
+VERSION = (1, 27, 0, "final", 0)
 
 
 def get_version():
diff -r 534c13786e89 -r 2ade832d1462 src/ldt/ldt/ldt_utils/contentindexer.py
--- a/src/ldt/ldt/ldt_utils/contentindexer.py	Fri Oct 19 14:47:27 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/contentindexer.py	Fri Oct 19 14:49:02 2012 +0200
@@ -1,13 +1,14 @@
-from ldt import settings
 from django.db.models.signals import post_save
 from django.dispatch import receiver
+from ldt import settings
 from ldt.ldt_utils.models import Segment, Content, Project
+from ldt.ldt_utils.stat import update_stat_project
 from ldt.ldt_utils.utils import reduce_text_node
-from ldt.ldt_utils.stat import update_stat_project
-import lxml.etree
+from tagging import settings as tagging_settings
+import logging
+import lxml.etree #@UnresolvedImport
 import tagging.utils
 import urllib #@UnresolvedImport
-import logging
 
 logger = logging.getLogger(__name__)
 
@@ -70,7 +71,7 @@
                 if tags is None:
                     tags = u""
                     
-                tags_list = [tag[:settings.MAX_TAG_LENGTH] for tag in tagging.utils.parse_tag_input(tags)]
+                tags_list = [tag[:tagging_settings.MAX_TAG_LENGTH] for tag in tagging.utils.parse_tag_input(tags)]
                 tags = u",".join(tags_list)