From: Kenneth Reitz <me@kennethreitz.com>
Date: Sat, 14 May 2011 17:04:49 +0000 (-0400)
Subject: Added Megan Emurayama to authors
X-Git-Tag: v0.3.4^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1e28c7fd8a9fe15d16a9636950559869b46ea96;p=services%2Fpython-requests.git

Added Megan Emurayama to authors
---

diff --git a/AUTHORS b/AUTHORS
index e09b366..d136e02 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,3 +18,4 @@ Patches and Suggestions
 - Rob Madole
 - Aram Dulyan
 - Johannes Gorset
+- 村山めがね (Megan Emurayama)
\ No newline at end of file
diff --git a/requests/core.py b/requests/core.py
index 69d0f3f..a90cdd7 100644
--- a/requests/core.py
+++ b/requests/core.py
@@ -65,24 +65,28 @@ class Request(object):
     def __init__(self, url=None, headers=dict(), files=None, method=None,
                  data=dict(), auth=None, cookiejar=None, timeout=None):
 
+        socket.setdefaulttimeout(timeout)
+
         self.url = url
         self.headers = headers
         self.files = files
         self.method = method
         self.data = {}
 
-        socket.setdefaulttimeout(timeout)
-
+        # self.data = {}
         if hasattr(data, 'items'):
             for (k, v) in data.items():
                 self.data.update({
                     k.encode('utf-8') if isinstance(k, unicode) else k:
                     v.encode('utf-8') if isinstance(v, unicode) else v
                 })
-            # url encode data if it's a dict
+
+        # url encode data if it's a dict
+        if hasattr(data, 'items'):
             self._enc_data = urllib.urlencode(self.data)
         else:
-            self._enc_data = self.data
+            self._enc_data = data
+
 
         self.response = Response()
 
@@ -210,8 +214,6 @@ class Request(object):
 
         if not self.sent or anyway:
 
-
-
             try:
                 opener = self._get_opener()
                 resp = opener(req)