From 74807f53c4ce184639174dd19fb63ec33d5fd73a Mon Sep 17 00:00:00 2001 From: Martin Michalec Date: Tue, 22 Dec 2020 21:03:35 +0100 Subject: [PATCH 1/4] Fix issue (#419) --- todoman/configuration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/todoman/configuration.py b/todoman/configuration.py index f013928f..1b510d92 100644 --- a/todoman/configuration.py +++ b/todoman/configuration.py @@ -5,8 +5,8 @@ import xdg.BaseDirectory from configobj import ConfigObj from configobj import flatten_errors -from validate import Validator -from validate import VdtValueError +from configobj.validate import Validator +from configobj.validate import VdtValueError from todoman import __documentation__ From 8fa1cc4ce175ef197af3ad69f3d9c471ea0609aa Mon Sep 17 00:00:00 2001 From: Martin Michalec Date: Tue, 22 Dec 2020 21:26:06 +0100 Subject: [PATCH 2/4] Handle different installation directories for parts of configobj --- todoman/configuration.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/todoman/configuration.py b/todoman/configuration.py index 1b510d92..7221f55a 100644 --- a/todoman/configuration.py +++ b/todoman/configuration.py @@ -5,8 +5,12 @@ import xdg.BaseDirectory from configobj import ConfigObj from configobj import flatten_errors -from configobj.validate import Validator -from configobj.validate import VdtValueError +try: + from configobj.validate import Validator + from configobj.validate import VdtValueError +except ImportError: + from configobj import Validator + from configobj import VdtValueError from todoman import __documentation__ From 0ddd609c66870e6205a0bf4f8dd81f0d3dcc1b35 Mon Sep 17 00:00:00 2001 From: Martin Michalec Date: Tue, 22 Dec 2020 21:35:13 +0100 Subject: [PATCH 3/4] Revert "Handle different installation directories for parts of configobj" This reverts commit 8fa1cc4ce175ef197af3ad69f3d9c471ea0609aa. --- todoman/configuration.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/todoman/configuration.py b/todoman/configuration.py index 7221f55a..1b510d92 100644 --- a/todoman/configuration.py +++ b/todoman/configuration.py @@ -5,12 +5,8 @@ import xdg.BaseDirectory from configobj import ConfigObj from configobj import flatten_errors -try: - from configobj.validate import Validator - from configobj.validate import VdtValueError -except ImportError: - from configobj import Validator - from configobj import VdtValueError +from configobj.validate import Validator +from configobj.validate import VdtValueError from todoman import __documentation__ From 8c8a460e94247abc00c454c88489cff3ab8f842e Mon Sep 17 00:00:00 2001 From: Martin Michalec Date: Tue, 22 Dec 2020 21:36:26 +0100 Subject: [PATCH 4/4] Handle different installation directories for parts of configobj --- todoman/configuration.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/todoman/configuration.py b/todoman/configuration.py index 1b510d92..69288d6b 100644 --- a/todoman/configuration.py +++ b/todoman/configuration.py @@ -5,8 +5,12 @@ import xdg.BaseDirectory from configobj import ConfigObj from configobj import flatten_errors -from configobj.validate import Validator -from configobj.validate import VdtValueError +try: + from configobj.validate import Validator + from configobj.validate import VdtValueError +except ImportError: + from validate import Validator + from validate import VdtValueError from todoman import __documentation__