From 5c7ce33cc0967ca55629c16e3959bd0abaf79be6 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Fri, 27 May 2011 14:29:57 +0100 Subject: [PATCH] Cleanup import, prep for new API key handling --- app/eve_proxy/models.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/eve_proxy/models.py b/app/eve_proxy/models.py index fff6ff7..8c4bb27 100755 --- a/app/eve_proxy/models.py +++ b/app/eve_proxy/models.py @@ -1,7 +1,5 @@ import urllib, urllib2 -import xml -import hashlib -import socket +from hashlib import sha1 from datetime import datetime, timedelta from xml.dom import minidom from django.db import models @@ -27,7 +25,7 @@ class CachedDocumentManager(models.Manager): def construct_url(self, url_path, params): # Valid arguments for EVE API Calls - allowed_params = ['userid', 'apikey', 'characterid', 'version', 'names', 'ids', 'corporationid', 'beforerefid', 'accountkey'] + allowed_params = ['apikey', 'userid', 'keyid', 'vcode', 'characterid', 'version', 'names', 'ids', 'corporationid', 'beforerefid', 'accountkey'] if len(params): for k, v in params.items(): @@ -54,7 +52,7 @@ class CachedDocumentManager(models.Manager): """ url = self.construct_url(url_path, params) - doc_key = hashlib.sha1(url).hexdigest() + doc_key = sha1(url).hexdigest() try: