diff --git a/syntax/python/dateregex/dateregex/__init__.py b/syntax/python/dateregex/dateregex/__init__.py index cfbc141..6864127 100644 --- a/syntax/python/dateregex/dateregex/__init__.py +++ b/syntax/python/dateregex/dateregex/__init__.py @@ -7,5 +7,5 @@ # Website: http://github.com/freitass/todo.txt-vim # Version: 0.1 -from after import regex_date_after -from before import regex_date_before +from dateregex.after import regex_date_after +from dateregex.before import regex_date_before diff --git a/syntax/python/dateregex/dateregex/after.py b/syntax/python/dateregex/dateregex/after.py index 8a13574..1e4027a 100644 --- a/syntax/python/dateregex/dateregex/after.py +++ b/syntax/python/dateregex/dateregex/after.py @@ -20,7 +20,7 @@ def _year_regex_after(year): regex = '|' + year[0:idx] regex += '9' if digit == '8' else '[%s-9]' % str(int(digit) + 1) if idx < len(year) - 1: - regex += '\d{%s}' % (len(year) - (idx + 1)) + regex += '\d{%s}' % (len(year) - (idx + 1)) year_regex += regex year_regex += ')' @@ -40,7 +40,7 @@ def _month_regex_after(year, month): if digit2 == '8': month_regex = r'(' + month_regex + r'|09)' else: - month_regex = r'(' + month_regex + r'|0[%s-9])' + month_regex = r'(' + month_regex + r'|0[%s-9])' month_regex = month_regex % str(int(digit2) + 1) return '-'.join((year, month_regex, r'\d{2}')) diff --git a/syntax/python/dateregex/dateregex/before.py b/syntax/python/dateregex/dateregex/before.py index 8a3402e..0e8cb96 100644 --- a/syntax/python/dateregex/dateregex/before.py +++ b/syntax/python/dateregex/dateregex/before.py @@ -10,7 +10,7 @@ from datetime import date, timedelta, MINYEAR def _year_regex_before(year): - if int(year) <= MINYEAR: + if int(year) <= MINYEAR: return None year_regex = r'(' year_regex += r'\d{1,%s}' % str(len(year) - 1) if len(year) > 1 else '' @@ -19,12 +19,11 @@ def _year_regex_before(year): regex = '|' + year[0:idx] regex += '0' if digit == '1' else '[0-%s]' % str(int(digit) - 1) if idx < len(year) - 1: - regex += '\d{%s}' % (len(year) - (idx + 1)) + regex += '\d{%s}' % (len(year) - (idx + 1)) year_regex += regex year_regex += ')' return '-'.join((year_regex, r'\d{2}', r'\d{2}')) - def _month_regex_before(year, month): if month == '01': return None @@ -33,7 +32,7 @@ def _month_regex_before(year, month): if digit1 == '0': month_regex = '01' if month == '02' else r'0[1-%s]' % str(int(digit2) - 1) elif month == '10': - month_regex = r'0\d' + month_regex = r'0\d' elif month == '11': month_regex = r'(0\d|10)' else: @@ -63,7 +62,6 @@ def _day_regex_before(year, month, day): return '-'.join((year, month, day_regex)) - def regex_date_before(given_date): year, month, day = given_date.isoformat().split('-') diff --git a/syntax/python/todo.py b/syntax/python/todo.py index 36d0d9d..e928026 100644 --- a/syntax/python/todo.py +++ b/syntax/python/todo.py @@ -16,11 +16,11 @@ if os.path.isdir(dateregex_dir): sys.path.insert(0, dateregex_dir) def add_due_date_syntax_highlight(): - try: + try: from dateregex import regex_date_before except ImportError: print("dateregex module not found. Overdue dates won't be highlighted") - return + return regex = regex_date_before(date.today()) regex = r'(^|<)due:%s(>|$)' % regex diff --git a/syntax/todo.vim b/syntax/todo.vim index 46de37c..e8ad616 100644 --- a/syntax/todo.vim +++ b/syntax/todo.vim @@ -51,10 +51,12 @@ highlight default link TodoDate PreProc highlight default link TodoProject Special highlight default link TodoContext Special +let b:curdir = expand(':p:h') +let s:script_dir = b:curdir . "/python/" if has('python') - let b:curdir = expand(':p:h') - let s:script_dir = b:curdir . "/python/" execute "pyfile " . s:script_dir. "todo.py" +elseif has('python3') + execute "py3file " . s:script_dir. "todo.py" endif let b:current_syntax = "todo"