diff --git a/requests/__init__.py b/requests/__init__.py index 15a50506..e75db8df 100644 --- a/requests/__init__.py +++ b/requests/__init__.py @@ -1,4 +1,31 @@ # -*- coding: utf-8 -*- -from core import * -from core import __version__ +""" +requests.core +~~~~~~~~~~~~~ + +This module implements the main Requests system. + +:copyright: (c) 2011 by Kenneth Reitz. +:license: ISC, see LICENSE for more details. + +""" + +__title__ = 'requests' +__version__ = '0.6.6' +__build__ = 0x000606 +__author__ = 'Kenneth Reitz' +__license__ = 'ISC' +__copyright__ = 'Copyright 2011 Kenneth Reitz' + + +from . import utils +from .models import HTTPError, Request, Response +from .api import request, get, head, post, patch, put, delete +from .sessions import session +from .status_codes import codes +from .config import settings +from .exceptions import ( + RequestException, AuthenticationError, Timeout, URLRequired, + InvalidMethod, TooManyRedirects +) diff --git a/requests/core.py b/requests/core.py deleted file mode 100644 index e75db8df..00000000 --- a/requests/core.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -requests.core -~~~~~~~~~~~~~ - -This module implements the main Requests system. - -:copyright: (c) 2011 by Kenneth Reitz. -:license: ISC, see LICENSE for more details. - -""" - -__title__ = 'requests' -__version__ = '0.6.6' -__build__ = 0x000606 -__author__ = 'Kenneth Reitz' -__license__ = 'ISC' -__copyright__ = 'Copyright 2011 Kenneth Reitz' - - -from . import utils -from .models import HTTPError, Request, Response -from .api import request, get, head, post, patch, put, delete -from .sessions import session -from .status_codes import codes -from .config import settings -from .exceptions import ( - RequestException, AuthenticationError, Timeout, URLRequired, - InvalidMethod, TooManyRedirects -)