move __version__ to __init__.py so we don't have to modify the mock.p…

…y from cpython.

mock/__init__.py

@@ -1,4 +1,9 @@
 from __future__ import absolute_import
 import mock.mock as _mock
 from mock.mock import *
-__all__ = _mock.__all__
+
+__version__ = '4.0.0b1'
+version_info = tuple(int(p) for p in __version__.split('.'))
+
+
+__all__ = ('__version__', 'version_info') + _mock.__all__

mock/mock.py

@@ -34,8 +34,6 @@
 from __future__ import absolute_import
 
 __all__ = (
-    '__version__',
-    'version_info',
     'Mock',
     'MagicMock',
     'patch',
@@ -69,8 +67,6 @@
 import six
 from six import wraps
 
-__version__ = '3.0.5'
-version_info = tuple(int(p) for p in __version__.split('.'))
 
 import mock
 

release.py

@@ -50,7 +50,7 @@ def news_to_changelog(version):
 
 
 def update_version(new_version):
-    path = join('mock', 'mock.py')
+    path = join('mock', '__init__.py')
     with open(path) as source:
         text = source.read()
 

setup.py

@@ -5,6 +5,6 @@
 
 setuptools.setup(
     version=re.search("__version__ = '([^']+)'",
-                      open(join('mock', 'mock.py')).read()).group(1),
+                      open(join('mock', '__init__.py')).read()).group(1),
     long_description=open('README.rst').read(),
 )