summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Dennis <rdennis@gmail.com>2023-01-18 17:27:43 -0500
committerGitHub <noreply@github.com>2023-01-18 17:27:43 -0500
commita58c2f4de0e9e854daa67fec630506e5a461eea9 (patch)
tree751ff4d800fee3178df911deb3f795735fc5d764 /src
parent62c2c88688e5ff110792bb0d0547c5206bd036c7 (diff)
parent97325b9f65cdc2883ab36e305778fdb58205d4ce (diff)
downloadconfigobj-git-release.tar.gz
Merge pull request #231 from DiffSK/5.0.xHEADv5.0.8release
prepping to release 5.0.8
Diffstat (limited to 'src')
-rw-r--r--src/configobj/_version.py2
-rw-r--r--src/configobj/validate.py1
-rw-r--r--src/tests/test_validate.py14
-rw-r--r--src/validate/__init__.py22
4 files changed, 37 insertions, 2 deletions
diff --git a/src/configobj/_version.py b/src/configobj/_version.py
index 3379d0a..f9d71a5 100644
--- a/src/configobj/_version.py
+++ b/src/configobj/_version.py
@@ -1 +1 @@
-__version__ = '5.0.7' \ No newline at end of file
+__version__ = '5.0.8' \ No newline at end of file
diff --git a/src/configobj/validate.py b/src/configobj/validate.py
index b7a964c..9267a3f 100644
--- a/src/configobj/validate.py
+++ b/src/configobj/validate.py
@@ -158,7 +158,6 @@ __all__ = (
'is_ip_addr_list',
'is_mixed_list',
'is_option',
- '__docformat__',
)
diff --git a/src/tests/test_validate.py b/src/tests/test_validate.py
index 07c1de7..2d72821 100644
--- a/src/tests/test_validate.py
+++ b/src/tests/test_validate.py
@@ -5,6 +5,20 @@ import pytest
from configobj.validate import Validator, VdtValueTooSmallError
+class TestImporting(object):
+ def test_top_level(self, val):
+ import validate
+ assert val.__class__ is validate.Validator
+
+ def test_within_configobj_using_from(self, val):
+ from configobj import validate
+ assert val.__class__ is validate.Validator
+
+ def test_within_configobj(self, val):
+ import configobj.validate
+ assert val.__class__ is configobj.validate.Validator
+
+
class TestBasic(object):
def test_values_too_small(self, val):
config = '''
diff --git a/src/validate/__init__.py b/src/validate/__init__.py
new file mode 100644
index 0000000..7a88747
--- /dev/null
+++ b/src/validate/__init__.py
@@ -0,0 +1,22 @@
+"""
+This is a backwards compatibility-shim to support:
+
+ ```
+ import validate
+ ```
+
+ in a future release, we'd expect this to no longer work and
+ instead using:
+
+ ```
+ import configobj.validate
+ ```
+
+ or:
+
+ ```
+ from configobj import validate
+ ```
+"""
+from configobj.validate import *
+