diff --git a/requests/__about__.py b/requests/__about__.py deleted file mode 100644 index 9abded42..00000000 --- a/requests/__about__.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- - -# .-. .-. .-. . . .-. .-. .-. .-. -# |( |- |.| | | |- `-. | `-. -# ' ' `-' `-`.`-' `-' `-' ' `-' - -__title__ = 'requests' -__description__ = 'Python HTTP for Humans.' -__url__ = 'http://python-requests.org' -__version__ = '2.14.2' -__build__ = 0x021402 -__author__ = 'Kenneth Reitz' -__author_email__ = 'me@kennethreitz.org' -__license__ = 'Apache 2.0' -__copyright__ = 'Copyright 2017 Kenneth Reitz' -__cake__ = u'✨ 🍰 ✨ Thanks for using my software. It means the world to me. --kennethreitz' \ No newline at end of file diff --git a/requests/__init__.py b/requests/__init__.py index f1ca5318..3cc7ded8 100644 --- a/requests/__init__.py +++ b/requests/__init__.py @@ -40,9 +40,9 @@ is at . :license: Apache 2.0, see LICENSE for more details. """ -from .__about__ import __title__, __description__, __url__, __version__ -from .__about__ import __build__, __author__, __author_email__, __license__ -from .__about__ import __copyright__, __cake__ +from .__version__ import __title__, __description__, __url__, __version__ +from .__version__ import __build__, __author__, __author_email__, __license__ +from .__version__ import __copyright__, __cake__ # Attempt to enable urllib3's SNI support, if possible try: diff --git a/requests/utils.py b/requests/utils.py index b2a46abd..08a97fa8 100644 --- a/requests/utils.py +++ b/requests/utils.py @@ -20,7 +20,7 @@ import socket import struct import warnings -from .__about__ import __version__ +from .__version__ import __version__ from . import certs # to_native_string is unused here, but imported here for backwards compatibility from ._internal_utils import to_native_string diff --git a/setup.py b/setup.py index fd8a1716..534b23aa 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', '__about__.py')) as f: +with open(os.path.join(here, 'requests', '__version__.py')) as f: exec(f.read(), about) with open('README.rst', 'r', 'utf-8') as f: