From 9d069f625eae1e93910f6149ac605bc576b01b80 Mon Sep 17 00:00:00 2001 From: James Turk Date: Thu, 22 Jan 2015 17:37:52 -0500 Subject: [PATCH] fix cache flake8 --- scrapelib/cache.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/scrapelib/cache.py b/scrapelib/cache.py index 4a5737f..0fb5718 100644 --- a/scrapelib/cache.py +++ b/scrapelib/cache.py @@ -10,10 +10,8 @@ import string import requests import sqlite3 -try: - import json -except: - import simplejson as json +import json + class CachingSession(requests.Session): def __init__(self, cache_storage=None): @@ -160,7 +158,7 @@ def get(self, orig_key): # TODO: resp.request = request return resp except IOError: - return None + return None def set(self, key, response): """Set cache entry for key with contents of response.""" @@ -217,7 +215,7 @@ def set(self, key, response): mod = response.headers.pop('last-modified', None) status = int(response.status_code) rec = (key, status, mod, response.encoding, response.content, - json.dumps(dict(response.headers))) + json.dumps(dict(response.headers))) with self._conn: self._conn.execute("DELETE FROM cache WHERE key=?", (key, )) self._conn.execute("INSERT INTO cache VALUES (?,?,?,?,?,?)", rec) @@ -250,8 +248,7 @@ def get(self, key): def clear(self): """Remove all records from cache.""" with self._conn: - _ = self._conn.execute('DELETE FROM cache') + self._conn.execute('DELETE FROM cache') def __del__(self): self._conn.close() -