From 6f504afe0bfd3111e0893d7ce6786316b6ebac04 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 21 Feb 2018 09:06:51 -0800 Subject: fix rebasing errors --- alot/settings/manager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'alot/settings') diff --git a/alot/settings/manager.py b/alot/settings/manager.py index 3375f74d..6693bb1c 100644 --- a/alot/settings/manager.py +++ b/alot/settings/manager.py @@ -176,12 +176,12 @@ class SettingsManager(object): value = section[key] - if isinstance(value, (str, unicode)): + if isinstance(value, str): section[key] = expand_environment_and_home(value) elif isinstance(value, (list, tuple)): new = list() for item in value: - if isinstance(item, (str, unicode)): + if isinstance(item, str): new.append(expand_environment_and_home(item)) else: new.append(item) @@ -529,7 +529,7 @@ class SettingsManager(object): def represent_datetime(self, d): """ - turns a given datetime obj into a unicode string representation. + turns a given datetime obj into a string representation. This will: 1) look if a fixed 'timestamp_format' is given in the config -- cgit v1.2.3