From: Robert Estelle Date: Wed, 31 Jul 2013 05:59:11 +0000 (-0700) Subject: Skip unneccessary Request.copy in Session.request X-Git-Tag: 2.0~5^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9edba838b3c7891c955b49d680c49b4ee8e64dd4;p=services%2Fpython-requests.git Skip unneccessary Request.copy in Session.request --- diff --git a/requests/sessions.py b/requests/sessions.py index ce3064b..2b6b607 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -231,6 +231,8 @@ class Session(SessionRedirectMixin): def update_request(self, request): """Destructively updates/merges the settings of a :class:`Request` object from those of the :class:`Session`. + + :param request: mutable :class:`Request` instance. """ cookies = request.cookies or {} @@ -257,10 +259,9 @@ class Session(SessionRedirectMixin): request.hooks = merge_setting(request.hooks, self.hooks) request.method = request.method.upper() - return request - def prepare_request(self, request): - req = self.update_request(request.copy()) + req = request.copy() + self.update_request(req) return req.prepare() def request(self, method, url, @@ -318,7 +319,8 @@ class Session(SessionRedirectMixin): cookies = cookies, hooks = hooks, ) - prep = self.prepare_request(req) + self.update_request(req) + prep = req.prepare() proxies = proxies or {}