Miroslavsckaya/tg_rss_bot
1
1
Fork 0
Code Issues 7 Pull requests Projects 1 Releases Activity

code style changes

Browse source
This commit is contained in:
mitsuha_s 2022-07-13 21:54:15 +00:00
parent 50ac344095
commit 2dde80f715
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
database.py
View file

@ -1,9 +1,7 @@
import psycopg2 from logging import Logger
import psycopg2
from psycopg2.extensions import connection from psycopg2.extensions import connection
from psycopg2.extras import DictCursor, DictRow from psycopg2.extras import DictCursor, DictRow
from logging import Logger
from exceptions import DisplayableException from exceptions import DisplayableException
from rss import FeedItem from rss import FeedItem
@ -131,7 +129,7 @@ class Database:
"""Return a list of feeds the user is subscribed to.""" """Return a list of feeds the user is subscribed to."""
self.log.debug('find_user_feeds(user_id=\'%s\')', user_id) self.log.debug('find_user_feeds(user_id=\'%s\')', user_id)
self.cur.execute('SELECT * FROM feeds WHERE id IN (SELECT feed_id FROM subscriptions WHERE user_id = %s)', self.cur.execute('SELECT * FROM feeds WHERE id IN (SELECT feed_id FROM subscriptions WHERE user_id = %s)',
[user_id]) [user_id])
return self.__dictrow_to_dict_list(self.cur.fetchall()) return self.__dictrow_to_dict_list(self.cur.fetchall())
def find_feed_items(self, feed_id: int) -> list[dict]: def find_feed_items(self, feed_id: int) -> list[dict]:
@ -184,4 +182,4 @@ class Database:
@staticmethod @staticmethod
def __dictrow_to_dict_list(rows: list[DictRow]) -> list[dict]: def __dictrow_to_dict_list(rows: list[DictRow]) -> list[dict]:
"""Convert list of DictRows to list of dicts""" """Convert list of DictRows to list of dicts"""
return list(map(lambda x: dict(x), rows)) return list(dict, rows)