diff options
Diffstat (limited to 'lib/srtgui/templatetags/projecttags.py')
-rw-r--r-- | lib/srtgui/templatetags/projecttags.py | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/lib/srtgui/templatetags/projecttags.py b/lib/srtgui/templatetags/projecttags.py index 6b3132ed..d7bc5319 100644 --- a/lib/srtgui/templatetags/projecttags.py +++ b/lib/srtgui/templatetags/projecttags.py @@ -20,13 +20,11 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import os -from datetime import datetime, timedelta from os.path import relpath import re import json as JsonLib from django import template -from django.utils import timezone from django.template.defaultfilters import filesizeformat from django.utils.safestring import mark_safe from django.contrib.auth.models import Group @@ -84,21 +82,18 @@ def json(value, default = None): @register.filter("whitespace_slice") def whitespace_space_filter(value, arg): - try: - bits = [] - for x in arg.split(":"): - if len(x) == 0: - bits.append(None) + bits = [] + for x in arg.split(":"): + if len(x) == 0: + bits.append(None) + else: + # convert numeric value to the first whitespace after + first_whitespace = value.find(" ", int(x)) + if first_whitespace == -1: + bits.append(int(x)) else: - # convert numeric value to the first whitespace after - first_whitespace = value.find(" ", int(x)) - if first_whitespace == -1: - bits.append(int(x)) - else: - bits.append(first_whitespace) - return value[slice(*bits)] - except (ValueError, TypeError): - raise + bits.append(first_whitespace) + return value[slice(*bits)] @register.filter def divide(value, arg): @@ -190,8 +185,8 @@ def check_filter_status(options, filter): def variable_parent_name(value): """ filter extended variable names to the parent name """ - value=re.sub('_\$.*', '', value) - return re.sub('_[a-z].*', '', value) + value=re.sub(r'_\$.*', '', value) + return re.sub(r'_[a-z].*', '', value) @register.filter def filter_setin_files(file_list, matchstr): @@ -256,7 +251,6 @@ def filter_sizeovertotal(package_object, total_size): return '{:.1%}'.format(float(size)/float(total_size)) -from django.utils.safestring import mark_safe @register.filter def format_vpackage_rowclass(size): if size == -1: |