No mo' HttpError

This commit is contained in:
Kenneth Reitz
2011-10-23 17:18:39 -04:00
parent 0008b035e2
commit c108c5300f
3 changed files with 11 additions and 7 deletions
+1 -1
View File
@@ -23,7 +23,7 @@ __copyright__ = 'Copyright 2011 Kenneth Reitz'
from . import utils
from .models import HTTPError, Request, Response
from .models import Request, Response
from .api import request, get, head, post, patch, put, delete
from .sessions import session
from .status_codes import codes
+4 -3
View File
@@ -12,21 +12,22 @@ import urllib2
import socket
import zlib
from urllib2 import HTTPError
from urlparse import urlparse, urlunparse, urljoin
from datetime import datetime
from .auth import dispatch as auth_dispatch
from .hooks import dispatch_hook
from .structures import CaseInsensitiveDict
from .packages.poster.encode import multipart_encode
from .packages.poster.streaminghttp import register_openers, get_handlers
from .utils import (dict_from_cookiejar, get_unicode_from_response, stream_decode_response_unicode, decode_gzip, stream_decode_gzip)
from .status_codes import codes
from .exceptions import Timeout, URLRequired, TooManyRedirects
from .monkeys import Request as _Request
from .monkeys import HTTPRedirectHandler
from .utils import (
dict_from_cookiejar, get_unicode_from_response,
stream_decode_response_unicode, decode_gzip, stream_decode_gzip)
from .auth import dispatch as auth_dispatch
REDIRECT_STATI = (codes.moved, codes.found, codes.other, codes.temporary_moved)
+6 -3
View File
@@ -51,7 +51,9 @@ def merge_kwargs(local_kwarg, default_kwarg):
class Session(object):
"""A Requests session."""
__attrs__ = ['headers', 'cookies', 'auth', 'timeout', 'proxies', 'hooks', 'params', 'config']
__attrs__ = [
'headers', 'cookies', 'auth', 'timeout', 'proxies', 'hooks',
'params', 'config']
def __init__(self,
@@ -62,7 +64,8 @@ class Session(object):
proxies=None,
hooks=None,
params=None,
config=None):
config=None,
keep_alive=True):
self.headers = headers or {}
self.cookies = cookies or {}
@@ -72,6 +75,7 @@ class Session(object):
self.hooks = hooks or {}
self.params = params or {}
self.config = config or {}
self.keep_alive = keep_alive
for (k, v) in defaults.items():
self.config.setdefault(k, v)
@@ -169,7 +173,6 @@ class Session(object):
# Send the HTTP Request.
r.send()
return r.response