PEP8 and general cleanups
This commit is contained in:
@@ -2,13 +2,11 @@ from __future__ import absolute_import
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import ugettext
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.template.defaultfilters import slugify
|
||||
|
||||
from metadata.classes import MetadataClass
|
||||
|
||||
from .models import (Index, IndexTemplateNode, IndexInstanceNode,
|
||||
DocumentRenameCount)
|
||||
from .models import Index, IndexInstanceNode, DocumentRenameCount
|
||||
from .conf.settings import (AVAILABLE_INDEXING_FUNCTIONS,
|
||||
MAX_SUFFIX_COUNT, SLUGIFY_PATHS)
|
||||
from .filesystem import (fs_create_index_directory,
|
||||
@@ -94,7 +92,7 @@ def cascade_eval(eval_dict, document, template_node, parent_index_instance=None)
|
||||
fs_create_index_directory(index_instance)
|
||||
except Exception, exc:
|
||||
warnings.append(_(u'Error updating document index, expression: %(expression)s; %(exception)s') % {
|
||||
'expression': template_node.expression, 'exception': exc})
|
||||
'expression': template_node.expression, 'exception': exc})
|
||||
|
||||
if template_node.link_documents:
|
||||
suffix = find_lowest_available_suffix(index_instance, document)
|
||||
@@ -109,7 +107,7 @@ def cascade_eval(eval_dict, document, template_node, parent_index_instance=None)
|
||||
fs_create_document_link(index_instance, document, suffix)
|
||||
except Exception, exc:
|
||||
warnings.append(_(u'Error updating document index, expression: %(expression)s; %(exception)s') % {
|
||||
'expression': template_node.expression, 'exception': exc})
|
||||
'expression': template_node.expression, 'exception': exc})
|
||||
|
||||
index_instance.documents.add(document)
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ from .api import update_indexes
|
||||
def do_rebuild_all_indexes():
|
||||
for index in Index.objects.all():
|
||||
fs_delete_directory_recusive(index)
|
||||
|
||||
|
||||
IndexInstanceNode.objects.all().delete()
|
||||
DocumentRenameCount.objects.all().delete()
|
||||
for document in Document.objects.all():
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import absolute_import
|
||||
|
||||
#from django.utils.safestring import mark_safe
|
||||
from django.utils.html import conditional_escape, mark_safe
|
||||
from django.utils.html import mark_safe
|
||||
|
||||
from .models import IndexInstanceNode
|
||||
|
||||
@@ -73,7 +72,7 @@ def get_breadcrumbs(index_instance, simple=False, single_link=False, include_cou
|
||||
else:
|
||||
output.insert(0, u' / '.join(result))
|
||||
return mark_safe(u' '.join(output))
|
||||
|
||||
|
||||
|
||||
def node_level(x):
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user