#230 - allow importing validate directly to still work

3 files changed, 35 insertions, 3 deletions

diff --git a/setup.py b/setup.py
index fcdecc0..f18451c 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ __here__ = os.path.abspath(os.path.dirname(__file__))
 
 NAME = 'configobj'
 MODULES = []
-PACKAGES = ['configobj']
+PACKAGES = ['configobj', 'validate']
 DESCRIPTION = 'Config file reading, writing and validation.'
 URL = 'https://github.com/DiffSK/configobj'
 
@@ -105,7 +105,7 @@ CLASSIFIERS = [
 
 AUTHOR = 'Rob Dennis, Eli Courtwright (Michael Foord & Nicola Larosa original maintainers)'
 
-AUTHOR_EMAIL = 'rdennis+configobj@gmail.com, eli@courtwright.org, fuzzyman@voidspace.co.uk, nico@tekNico.net'
+AUTHOR_EMAIL = 'rdennis+configobj@gmail.com, eli@courtwright.org, michael@python.org, nico@tekNico.net'
 
 KEYWORDS = "config, ini, dictionary, application, admin, sysadmin, configuration, validation".split(', ')
 
@@ -121,7 +121,7 @@ project = dict(
     package_dir={'': 'src'},
     packages=PACKAGES,
     install_requires=[i.strip() for i in REQUIRES.splitlines() if i.strip()],
-    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
     classifiers=CLASSIFIERS,
     keywords=KEYWORDS,
     license='BSD (2 clause)',
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