From dc720acb3324f6fd88accb88ad8d342a9483f985 Mon Sep 17 00:00:00 2001
From: Rob Dennis <robd@services-in.xr>
Date: Wed, 18 Jan 2023 17:06:44 -0500
Subject: #230 - allow importing validate directly to still work

---
 src/tests/test_validate.py | 11 +++++++++++
 src/validate/__init__.py   | 21 +++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 src/validate/__init__.py

(limited to 'src')

diff --git a/src/tests/test_validate.py b/src/tests/test_validate.py
index 07c1de7..2a19cc8 100644
--- a/src/tests/test_validate.py
+++ b/src/tests/test_validate.py
@@ -5,6 +5,17 @@ import pytest
 from configobj.validate import Validator, VdtValueTooSmallError
 
 
+class TestImporting(object):
+    def test_top_level(self):
+        import validate
+        
+    def test_within_configobj_using_from(self):
+        from configobj import validate
+
+    def test_within_configobj(self):
+        import configobj.validate
+
+
 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..c3bbcd3
--- /dev/null
+++ b/src/validate/__init__.py
@@ -0,0 +1,21 @@
+"""
+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
+ ```
+"""
+import configobj.validate as validate
-- 
cgit v1.2.1


From 17ff246e028c32ff23d85a04962b8e82ab33b32b Mon Sep 17 00:00:00 2001
From: Rob Dennis <robd@services-in.xr>
Date: Wed, 18 Jan 2023 17:17:28 -0500
Subject: #230 - changed how validate shim import is done and the associated
 unit test

---
 src/configobj/validate.py  |  1 -
 src/tests/test_validate.py | 11 +++++++----
 src/validate/__init__.py   |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src')

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 2a19cc8..2d72821 100644
--- a/src/tests/test_validate.py
+++ b/src/tests/test_validate.py
@@ -6,14 +6,17 @@ from configobj.validate import Validator, VdtValueTooSmallError
 
 
 class TestImporting(object):
-    def test_top_level(self):
+    def test_top_level(self, val):
         import validate
-        
-    def test_within_configobj_using_from(self):
+        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):
+    def test_within_configobj(self, val):
         import configobj.validate
+        assert val.__class__ is configobj.validate.Validator
 
 
 class TestBasic(object):
diff --git a/src/validate/__init__.py b/src/validate/__init__.py
index c3bbcd3..7a88747 100644
--- a/src/validate/__init__.py
+++ b/src/validate/__init__.py
@@ -18,4 +18,5 @@ This is a backwards compatibility-shim to support:
  from configobj import validate
  ```
 """
-import configobj.validate as validate
+from configobj.validate import *
+
-- 
cgit v1.2.1


From 97325b9f65cdc2883ab36e305778fdb58205d4ce Mon Sep 17 00:00:00 2001
From: Rob Dennis <robd@services-in.xr>
Date: Wed, 18 Jan 2023 17:23:53 -0500
Subject: #230 - prepping for a 5.0.8 tag

---
 src/configobj/_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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
-- 
cgit v1.2.1