Merge pull request #4064 from sigmavirus24/fix-rtfd

Avoid breaking people using requests.__version__

4 files changed, 3 insertions, 3 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 674f198e..9b135d31 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -25,7 +25,7 @@ sys.path.insert(0, os.path.abspath('..'))
 sys.path.insert(0, os.path.abspath('_themes'))
 
 import requests
-from requests.__version__ import __version__
+from requests import __version__
 
 
 # -- General configuration ------------------------------------------------
diff --git a/requests/__version__.py b/requests/__about__.py
index 9abded42..9abded42 100644
--- a/requests/__version__.py
+++ b/requests/__about__.py
diff --git a/requests/__init__.py b/requests/__init__.py
index 2bcba252..4d3055c8 100644
--- a/requests/__init__.py
+++ b/requests/__init__.py
@@ -40,7 +40,7 @@ is at <http://python-requests.org>.
 :license: Apache 2.0, see LICENSE for more details.
 """
 
-from .__version__ import *
+from .__about__ import *
 
 # Attempt to enable urllib3's SNI support, if possible
 try:
diff --git a/setup.py b/setup.py
index 534b23aa..fd8a1716 100755
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@ requires = []
 test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock']
 
 about = {}
-with open(os.path.join(here, 'requests', '__version__.py')) as f:
+with open(os.path.join(here, 'requests', '__about__.py')) as f:
     exec(f.read(), about)
 
 with open('README.rst', 'r', 'utf-8') as f: