From 38e0624cccfbeb0f9ee8100147a5c8187b658d11 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Fri, 4 Jun 2010 16:55:11 +0100 Subject: [PATCH] Further tidyup to avoid some situations occuring --- eve_proxy/models.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/eve_proxy/models.py b/eve_proxy/models.py index 5f9605f..a88cb4a 100755 --- a/eve_proxy/models.py +++ b/eve_proxy/models.py @@ -16,8 +16,8 @@ class CachedDocumentManager(models.Manager): """ def get_document_id(self, url_path, params): - p = params.copy() - if p: + if params: + p = params.copy() if 'service' in p: del p['service'] paramstr = urllib.urlencode(p) @@ -35,14 +35,12 @@ class CachedDocumentManager(models.Manager): method = 'GET' paramstr = '' + service = 'auth' - print params if params: if 'service' in params: service = params['service'] del params['service'] - else: - service = 'auth' paramstr = urllib.urlencode(params) if len(paramstr.strip()) > 0: @@ -52,8 +50,6 @@ class CachedDocumentManager(models.Manager): conn = httplib.HTTPConnection(API_URL) conn.request(method, url_path, paramstr, headers) response = conn.getresponse() - - print service, url_path, paramstr, response.status if response.status == 200: doc_id = self.get_document_id(url_path, params)