From 61a8c8c354033cd110cccbdd5b01161027586f8d Mon Sep 17 00:00:00 2001 From: Izalia Mae Date: Thu, 18 Mar 2021 18:55:46 -0400 Subject: [PATCH] cache: minor fix, database: add CreateTables function, http: remove HttpRequest class --- IzzyLib/cache.py | 5 +++-- IzzyLib/database.py | 5 +++++ IzzyLib/http.py | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/IzzyLib/cache.py b/IzzyLib/cache.py index 780e748..3e063a5 100644 --- a/IzzyLib/cache.py +++ b/IzzyLib/cache.py @@ -43,6 +43,7 @@ def parse_ttl(ttl): class BaseCache(OrderedDict): + _get = OrderedDict.get def __init__(self, maxsize=1024, ttl=None): self.ttl = parse_ttl(ttl) self.maxsize = maxsize @@ -55,10 +56,10 @@ class BaseCache(OrderedDict): def get(self, key): - while len(self) >= self.maxsize and self.maxsize != 0: + while len(self) >= self.maxsize and self.maxsize > 0: self.popitem(last=False) - item = DotDict.get(self, key) + item = self._get(key) if not item: return diff --git a/IzzyLib/database.py b/IzzyLib/database.py index 05a28ae..978deba 100644 --- a/IzzyLib/database.py +++ b/IzzyLib/database.py @@ -74,6 +74,11 @@ class DataBase(): self.cache = DotDict({table: LRUCache() for table in self.table_names}) + def CreateTables(self, *tables): + new_tables = [self.table[table] for table in tables] + self.table.meta.create_all(bind=self.db, tables=new_tables) + + def CreateDatabase(self): if self.engine_string.startswith('postgresql'): predb = create_engine(db.engine_string.replace(config.db.name, 'postgres', -1)) diff --git a/IzzyLib/http.py b/IzzyLib/http.py index 4441686..1103238 100644 --- a/IzzyLib/http.py +++ b/IzzyLib/http.py @@ -86,7 +86,7 @@ class HttpClient(object): new_headers = self.headers.copy() new_headers.update(headers) - parsed_headers = {k.lower(): v.lower() for k,v in new_headers.items()} + parsed_headers = {k.lower(): v for k,v in new_headers.items()} if not parsed_headers.get('user-agent'): parsed_headers['user-agent'] = self.agent @@ -97,7 +97,8 @@ class HttpClient(object): if isinstance(data, str): data = data.encode('UTF-8') - request = HttpRequest(url, data=data, headers=parsed_headers, method=method) + print(url, method, data) + request = Request(url, data=data, headers=parsed_headers, method=method) if self.proxy.enabled: request.set_proxy(f'{self.proxy.host}:{self.proxy.host}', self.proxy.ptype)