From: Kenneth Reitz <me@kennethreitz.com>
Date: Wed, 2 May 2012 22:58:08 +0000 (-0700)
Subject: Merge pull request #516 from EnTeQuAk/move_pre_request
X-Git-Tag: v0.12.0~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efe5d13ed67c8787dace024e28d4709ece7c056b;p=services%2Fpython-requests.git

Merge pull request #516 from EnTeQuAk/move_pre_request

Move pre_request to a more usable place, followup to #382
---

efe5d13ed67c8787dace024e28d4709ece7c056b
diff --cc requests/models.py
index 345dfbc,dd73743..184f91b
--- a/requests/models.py
+++ b/requests/models.py
@@@ -560,16 -525,22 +564,12 @@@ class Request(object)
  
          if not self.sent or anyway:
  
 -            if self.cookies:
 -
 -                # Skip if 'cookie' header is explicitly set.
 -                if 'cookie' not in self.headers:
 -
 -                    # Simple cookie with our dict.
 -                    c = SimpleCookie()
 -                    for (k, v) in list(self.cookies.items()):
 -                        c[k] = v
 -
 -                    # Turn it into a header.
 -                    cookie_header = c.output(header='', sep='; ').strip()
 -
 -                    # Attach Cookie header to request.
 +            # Skip if 'cookie' header is explicitly set.
 +            if 'cookie' not in self.headers:
 +                cookie_header = get_cookie_header(self.cookies, self)
 +                if cookie_header is not None:
                      self.headers['Cookie'] = cookie_header
  
-             # Pre-request hook.
-             r = dispatch_hook('pre_request', self.hooks, self)
-             self.__dict__.update(r.__dict__)
- 
              try:
                  # The inner try .. except re-raises certain exceptions as
                  # internal exception types; the outer suppresses exceptions