Move the timing work to Session.send

per @kennethreitz's request
This commit is contained in:
Ian Cordasco
2013-01-28 11:53:02 -05:00
parent 25545b393b
commit c8ad4f0b73
2 changed files with 3 additions and 4 deletions
-4
View File
@@ -9,7 +9,6 @@ and maintain connections.
"""
import socket
import datetime
from .models import Response
from .packages.urllib3.poolmanager import PoolManager, ProxyManager
@@ -156,7 +155,6 @@ class HTTPAdapter(BaseAdapter):
url = self.request_url(request, proxies)
chunked = not (request.body is None or 'Content-Length' in request.headers)
start = datetime.datetime.utcnow()
try:
if not chunked:
@@ -200,7 +198,6 @@ class HTTPAdapter(BaseAdapter):
preload_content=False,
decode_content=False
)
finish = datetime.datetime.utcnow()
except socket.error as sockerr:
raise ConnectionError(sockerr)
@@ -217,7 +214,6 @@ class HTTPAdapter(BaseAdapter):
raise Timeout('Request timed out.')
r = self.build_response(request, resp)
r.elapsed = finish - start
if not stream:
r.content
+3
View File
@@ -9,6 +9,7 @@ requests (cookies, auth, proxies).
"""
import os
from datetime import datetime
from .compat import cookielib
from .cookies import cookiejar_from_dict
@@ -368,7 +369,9 @@ class Session(SessionRedirectMixin):
"""Send a given PreparedRequest."""
hooks = request.hooks
adapter = self.get_adapter(url=request.url)
start = datetime.utcnow()
r = adapter.send(request, **kwargs)
r.elapsed = datetime.utcnow() - start
# Response manipulation hooks
r = dispatch_hook('response', hooks, r)
return r