From 80cfa2f815c4f2b5c304a2d30dfec35c4358c54d Mon Sep 17 00:00:00 2001 From: jkhsjdhjs Date: Mon, 16 Mar 2020 22:04:29 +0000 Subject: [PATCH] useless: fix syntax warning storage: shorten code --- bot/storage.py | 10 ++++------ bot/useless.py | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/bot/storage.py b/bot/storage.py index 00c22dc..c1ab5ba 100644 --- a/bot/storage.py +++ b/bot/storage.py @@ -15,28 +15,26 @@ class DBConn: def _reconnect(self): self._con = psycopg2.connect(*self.args, **self.kwargs) + return self._con def commit(self, *args, **kwargs): try: return self._con.commit(*args, **kwargs) except psycopg2.InterfaceError: - self._reconnect() - return self._con.commit(*args, **kwargs) + return self._reconnect().commit(*args, **kwargs) def rollback(self, *args, **kwargs): try: return self._con.rollback(*args, **kwargs) except psycopg2.InterfaceError: - self._reconnect() - return self._con.rollback(*args, **kwargs) + return self._reconnect().rollback(*args, **kwargs) @contextlib.contextmanager def cursor(self, *args, **kwargs): try: yield self._con.cursor(cursor_factory=DictCursor, *args, **kwargs) except psycopg2.InterfaceError: - self._reconnect() - yield self._con.cursor(cursor_factory=DictCursor, *args, **kwargs) + yield self._reconnect().cursor(cursor_factory=DictCursor, *args, **kwargs) class Storage(Plugin): diff --git a/bot/useless.py b/bot/useless.py index 55941ad..78094fd 100644 --- a/bot/useless.py +++ b/bot/useless.py @@ -114,7 +114,7 @@ class Useless(DatabasePlugin): @irc3.event(r'(?i)^:\S+ PRIVMSG (?P\S+) :.*(woah|whoa).*$') def woah(self, target: str): """Colorize words in a sentence with rainbow colors.""" - if random.randint(0, 4) is 0: + if random.randint(0, 4) == 0: self.bot.privmsg(target, random.choice(self.WOAH)) @irc3.event(r'(?i)^:\S+ PRIVMSG (?P\S+) :(?Phuehuehue)$')