From 728f9961b4e5138090483d4d05de43bd9292ece6 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Mon, 18 Mar 2013 19:43:34 -0400 Subject: [PATCH] HTTP delete operational, though we'll soon override this anyway --- lib/cli/main.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/cli/main.py b/lib/cli/main.py index 8ab632faf5..4cf2407b74 100644 --- a/lib/cli/main.py +++ b/lib/cli/main.py @@ -36,8 +36,9 @@ def update_item(item, data, expect=200): return resp def delete(url_seg, expect=204): - print "DELETING: %s" % url_seg - resp = requests.delete("%s/%s" % (server, url_seg), auth=AUTH, headers=HEADERS) + if not url_seg.endswith("/"): + url_seg = "%s/" % url_seg + resp = requests.delete("%s%s" % (server, url_seg), auth=AUTH, headers=HEADERS) if resp.status_code != expect: assert "DELETE: Expecting %s got %s: %s" % (expect, resp.status_code, resp.text) return resp @@ -49,9 +50,9 @@ class Collection(object): def __init__(self): self.response = get(self.base_url()) - print "---" - print self.response.text - print "---" + #print "---" + #print self.response.text + #print "---" try: self.data = json.loads(self.response.text) except Exception, e: