From dab0ec931ad312009d866661c233e64dbfab3544 Mon Sep 17 00:00:00 2001 From: jhermann Date: Tue, 26 Jul 2016 13:26:36 +0200 Subject: [PATCH] fix 'validate' imports for new package structure --- src/configobj/__init__.py | 2 +- src/tests/conftest.py | 2 +- src/tests/test_configobj.py | 2 +- src/tests/test_validate.py | 2 +- src/tests/test_validate_errors.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/configobj/__init__.py b/src/configobj/__init__.py index 96dd3a9..0ace112 100644 --- a/src/configobj/__init__.py +++ b/src/configobj/__init__.py @@ -2174,7 +2174,7 @@ def validate(self, validator, preserve_errors=False, copy=False, if preserve_errors: # We do this once to remove a top level dependency on the validate module # Which makes importing configobj faster - from validate import VdtMissingValue + from configobj.validate import VdtMissingValue self._vdtMissingValue = VdtMissingValue section = self diff --git a/src/tests/conftest.py b/src/tests/conftest.py index e11ad40..33b1bc9 100644 --- a/src/tests/conftest.py +++ b/src/tests/conftest.py @@ -2,7 +2,7 @@ import pytest from configobj import ConfigObj -from validate import Validator +from configobj.validate import Validator @pytest.fixture def empty_cfg(): diff --git a/src/tests/test_configobj.py b/src/tests/test_configobj.py index 2a1133e..b9c58c1 100644 --- a/src/tests/test_configobj.py +++ b/src/tests/test_configobj.py @@ -15,7 +15,7 @@ import configobj as co from configobj import ConfigObj, flatten_errors, ReloadError, DuplicateError, MissingInterpolationOption, InterpolationLoopError, ConfigObjError -from validate import Validator, VdtValueTooSmallError +from configobj.validate import Validator, VdtValueTooSmallError def cfg_lines(config_string_representation): diff --git a/src/tests/test_validate.py b/src/tests/test_validate.py index e1728f1..dddd5bb 100644 --- a/src/tests/test_validate.py +++ b/src/tests/test_validate.py @@ -5,7 +5,7 @@ from configobj import ConfigObj import pytest -from validate import Validator, VdtValueTooSmallError +from configobj.validate import Validator, VdtValueTooSmallError class TestBasic(object): diff --git a/src/tests/test_validate_errors.py b/src/tests/test_validate_errors.py index d1e9c1a..b256efa 100644 --- a/src/tests/test_validate_errors.py +++ b/src/tests/test_validate_errors.py @@ -7,7 +7,7 @@ import pytest from configobj import ConfigObj, get_extra_values, ParseError, NestingError -from validate import Validator +from configobj.validate import Validator @pytest.fixture() def thisdir():