From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 14 Feb 2011 00:04:47 +0000 (-0500)
Subject: DELETE in place.
X-Git-Tag: v0.2.0~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6fb1997b6a37f27aeda5e26aebcb886a4d2b817a;p=services%2Fpython-requests.git

DELETE in place.
---

diff --git a/requests/core.py b/requests/core.py
index 28844f1..0b87829 100644
--- a/requests/core.py
+++ b/requests/core.py
@@ -125,7 +125,7 @@ class Request(object):
 
 					success = True
 
-				except Exception:
+				except RequestException:
 					raise RequestException
 				
 
@@ -150,11 +150,13 @@ class Request(object):
 						self.response.content = resp.read()
 
 						success = True
-					except Exception:
-						raise RequestException
+					except urllib2.HTTPError:
+						self.resonse.status_code = 405
+
+				except Exception:
+					# TODO: Fix this shit
+					raise RequestException
 
-				except urllib2.HTTPError:
-					self.resonse.status_code = 405
 
 			
 		elif self.method.lower() == 'post':
@@ -298,7 +300,8 @@ def delete(url, params={}, headers={}, auth=None):
 	"""Sends a DELETE request. Returns :class:`Response` object.
 	"""
 	r = Request()
-	
+
+	r.url = url
 	r.method = 'DELETE'
 	# return response object