diff --git a/ox/api.py b/ox/api.py index 51742c2..042d0be 100644 --- a/ox/api.py +++ b/ox/api.py @@ -227,8 +227,6 @@ def signin(url): url = 'https://%s/api/' % url else: site = url.split('/')[2] - if not url.endswith('/'): - url += '/' api = API(url) update = False try: diff --git a/ox/cache.py b/ox/cache.py index 904f31d..c475322 100644 --- a/ox/cache.py +++ b/ox/cache.py @@ -456,47 +456,7 @@ class RedisCache(KVCache): self.backend = redis.from_url(self.url) -class FallbackCache(KVCache): - caches = [] - - def __init__(self): - fallback = cache_path() - for path in fallback.split('|'): - os.environ['oxCACHE'] = path - if path.startswith('redis:'): - store = RedisCache() - elif path.startswith('memcache:'): - store = MemCache() - self.caches.append(store) - os.environ['oxCACHE'] = fallback - - def get(self, url, data, headers=None, timeout=-1, value="data"): - if timeout == 0: - return None - - info_key, data_key = self._keys(url, data, headers) - for cache in self.caches: - try: - info = cache.backend.get(info_key) - except: - info = None - if info: - return cache.get(url, data, headers, timeout, value) - return None - - def set(self, url, post_data, data, headers): - self.caches[0].set(url, post_data, data, headers) - for cache in self.caches[1:]: - cache.delete(url, post_data, headers) - - def delete(self, url, data=None, headers=None): - for cache in self.caches: - cache.delete(url, data, headers) - - -if '|' in cache_path(): - store = FallbackCache() -elif cache_path().startswith('fs:'): +if cache_path().startswith('fs:'): store = FileCache() elif cache_path().startswith('redis:'): store = RedisCache() diff --git a/ox/web/imdb.py b/ox/web/imdb.py index 4821b0c..641fdd7 100644 --- a/ox/web/imdb.py +++ b/ox/web/imdb.py @@ -187,7 +187,7 @@ class Imdb(SiteParser): ], type='int'), 'keyword': { 'page': 'keywords', - 're': 'data-item-keyword="(.*?)"', + 're': '(.*?)', + '(.*?)', strip_tags, ], 'type': 'list' diff --git a/ox/web/piratecinema.py b/ox/web/piratecinema.py index 4ed946b..9ae3c24 100644 --- a/ox/web/piratecinema.py +++ b/ox/web/piratecinema.py @@ -7,7 +7,7 @@ from ox.net import read_url def get_poster_url(id): url = 'http://piratecinema.org/posters/' - html = read_url(url).decode('utf-8') + html = read_url(url, unicode=True) results = re.compile('src="(.+)" title=".+\((\d{7})\)"').findall(html) for result in results: if result[1] == id: