From: Kenneth Reitz <me@kennethreitz.com>
Date: Wed, 19 Oct 2011 07:32:53 +0000 (-0400)
Subject: add params to session merge attributes
X-Git-Tag: v0.6.6~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c74860fd1ae29c1ebc5896df9614076c34d1b6a;p=services%2Fpython-requests.git

add params to session merge attributes
---

diff --git a/requests/sessions.py b/requests/sessions.py
index 4e7022d..9226a54 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -49,7 +49,7 @@ def merge_kwargs(local_kwarg, default_kwarg):
 class Session(object):
     """A Requests session."""
 
-    __attrs__ = ['headers', 'cookies', 'auth', 'timeout', 'proxies', 'hooks']
+    __attrs__ = ['headers', 'cookies', 'auth', 'timeout', 'proxies', 'hooks', 'params']
 
 
     def __init__(self,
@@ -58,7 +58,8 @@ class Session(object):
         auth=None,
         timeout=None,
         proxies=None,
-        hooks=None):
+        hooks=None,
+        params=None):
 
         self.headers = headers or {}
         self.cookies = cookies or {}
@@ -66,6 +67,7 @@ class Session(object):
         self.timeout = timeout
         self.proxies = proxies or {}
         self.hooks = hooks or {}
+        self.params = params or {}
 
         # Set up a CookieJar to be used by default
         self.cookies = cookielib.FileCookieJar()