Added Megan Emurayama to authors

This commit is contained in:
Kenneth Reitz
2011-05-14 13:04:49 -04:00
parent 9b0bb871d2
commit b1e28c7fd8
2 changed files with 9 additions and 6 deletions
+1
View File
@@ -18,3 +18,4 @@ Patches and Suggestions
- Rob Madole
- Aram Dulyan
- Johannes Gorset
- 村山めがね (Megan Emurayama)
+8 -6
View File
@@ -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)