From cd156b503b9a06cbaae934b6d6466b225ebd1585 Mon Sep 17 00:00:00 2001 From: MinchinWeb Date: Tue, 10 Apr 2018 20:41:01 -0600 Subject: [PATCH] Be consistent with __future__ imports --- features/environment.py | 2 ++ jrnl/EncryptedJournal.py | 2 ++ jrnl/Entry.py | 2 +- jrnl/__init__.py | 2 +- jrnl/install.py | 2 +- jrnl/plugins/template.py | 2 ++ jrnl/plugins/util.py | 1 + jrnl/time.py | 7 +++++-- 8 files changed, 15 insertions(+), 5 deletions(-) diff --git a/features/environment.py b/features/environment.py index 6f9ac5df..3e974068 100644 --- a/features/environment.py +++ b/features/environment.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, unicode_literals + from behave import * import shutil import os diff --git a/jrnl/EncryptedJournal.py b/jrnl/EncryptedJournal.py index a29db554..0e26f1f0 100644 --- a/jrnl/EncryptedJournal.py +++ b/jrnl/EncryptedJournal.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, unicode_literals + from . import Journal, util from cryptography.fernet import Fernet, InvalidToken from cryptography.hazmat.primitives import hashes, padding diff --git a/jrnl/Entry.py b/jrnl/Entry.py index 1306cef5..12bfb98f 100755 --- a/jrnl/Entry.py +++ b/jrnl/Entry.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals import re import textwrap from datetime import datetime diff --git a/jrnl/__init__.py b/jrnl/__init__.py index 796c58c4..785a1e19 100644 --- a/jrnl/__init__.py +++ b/jrnl/__init__.py @@ -5,7 +5,7 @@ """ jrnl is a simple journal application for your command line. """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals __title__ = 'jrnl' __version__ = '2.0.0-rc1' diff --git a/jrnl/install.py b/jrnl/install.py index 7cc8f880..17373661 100644 --- a/jrnl/install.py +++ b/jrnl/install.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import readline import glob import getpass diff --git a/jrnl/plugins/template.py b/jrnl/plugins/template.py index 0b4c533d..bbec852e 100644 --- a/jrnl/plugins/template.py +++ b/jrnl/plugins/template.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, unicode_literals + import re import asteval import yaml diff --git a/jrnl/plugins/util.py b/jrnl/plugins/util.py index 0a642cb2..817c3a22 100644 --- a/jrnl/plugins/util.py +++ b/jrnl/plugins/util.py @@ -1,6 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 +from __future__ import absolute_import, unicode_literals def get_tags_count(journal): """Returns a set of tuples (count, tag) for all tags present in the journal.""" diff --git a/jrnl/time.py b/jrnl/time.py index 378d4c92..3e6be59c 100644 --- a/jrnl/time.py +++ b/jrnl/time.py @@ -1,7 +1,10 @@ +from __future__ import absolute_import, unicode_literals from datetime import datetime from dateutil.parser import parse as dateparse -try: import parsedatetime.parsedatetime_consts as pdt -except ImportError: import parsedatetime as pdt +try: + import parsedatetime.parsedatetime_consts as pdt +except ImportError: + import parsedatetime as pdt FAKE_YEAR = 9999 DEFAULT_FUTURE = datetime(FAKE_YEAR, 12, 31, 23, 59, 59)