#230 - changed how validate shim import is done and the associated unit test

3 files changed, 9 insertions, 6 deletions

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 *
+