From 3f50b86e88cbfc8c0f1728c84c13eed6ce1eebeb Mon Sep 17 00:00:00 2001
From: Johann Jacobsohn <j.jacobsohn@satzmedia.de>
Date: Mon, 31 Aug 2020 17:43:26 +0200
Subject: [PATCH] lint

---
 papersurfer/mattermost.py  | 10 +++++-----
 papersurfer/papersurfer.py | 23 +++++++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/papersurfer/mattermost.py b/papersurfer/mattermost.py
index 290a187..453af4f 100644
--- a/papersurfer/mattermost.py
+++ b/papersurfer/mattermost.py
@@ -1,7 +1,7 @@
 """Simplified mattermost interface."""
-import requests
 import logging
 import time
+import requests
 import mattermostdriver
 from .exceptions import ConfigError
 from .dtos import PostDTO
@@ -83,24 +83,24 @@ class Mattermost:
             else:
                 break
 
-        postDTOs = [PostDTO(
+        dtos = [PostDTO(
                         id=m['id'],
                         create_at=m['create_at'],
                         message=m['message'],
                         reporter=self._get_reporter(m['user_id']),
                         doi=Doi().extract_doi(m['message']),)
-                    for m in posts]
+                for m in posts]
 
         logging.debug("retrieving and processing %i mattermost posts took %f",
                       len(posts), time.perf_counter() - start)
 
-        return postDTOs
+        return dtos
 
     def _filter_incoming(self, posts):
         """Filter posts from mattermost to only papers."""
         return [p for p in posts if "doi" in p.message]
 
-    def retrieve(self, since):
+    def retrieve(self, since=None):
         """Retrieve papers from mattermost channel."""
         if not self._loggedin:
             self._login()
diff --git a/papersurfer/papersurfer.py b/papersurfer/papersurfer.py
index 08f2549..0b78274 100644
--- a/papersurfer/papersurfer.py
+++ b/papersurfer/papersurfer.py
@@ -16,6 +16,7 @@ import os
 import sys
 import re
 import logging
+from pathlib import Path
 import urwid
 import configargparse
 from tinydb import TinyDB, Query
@@ -48,7 +49,6 @@ class Papersurfer:
 
         self.db_path = "."
 
-        self.isLoggedIn = False
         self.db_posts = None
         self.db_papers = None
         self.db_file_posts = "papersurfer_posts_db.json"
@@ -58,7 +58,8 @@ class Papersurfer:
         """Load data from mattermost and save to storage."""
         self._connect_db()
         latest = self.get_latest_post()
-        posts = self.mattermost.retrieve(latest["create_at"] if latest else None)
+        posts = self.mattermost.retrieve(latest["create_at"]
+                                         if latest else None)
         self._update_db(posts=posts)
 
     def _connect_db(self):
@@ -74,7 +75,7 @@ class Papersurfer:
         if posts:
             posts.sort(reverse=True, key=lambda p: p["create_at"])
 
-        return posts[0] if len(posts) else []
+        return posts[0] if posts else None
 
     def _update_db(self, posts=[], papers=[]):
         """"Merge new data into database."""
@@ -94,7 +95,8 @@ class Papersurfer:
     def get_posts(self):
         """Get all posts in storage."""
         self._connect_db()
-        return [PostDTO(p["id"], p["create_at"], p["message"], p["reporter"], p["doi"])
+        return [PostDTO(p["id"], p["create_at"], p["message"],
+                        p["reporter"], p["doi"])
                 for p in self.db_posts.all()]
 
     def get_posts_filtered(self, needle=None):
@@ -167,12 +169,12 @@ class PapersurferUi:
 
         urwid.connect_signal(ask, 'change', self.onchange)
         self.mainloop = urwid.MainLoop(self._over, self._palette,
-                                       unhandled_input=self.h_unhandled_input)
+                                       unhandled_input=self._h_unhandled_input)
         self.mainloop.set_alarm_in(.1, self.load_list)
         self.mainloop.set_alarm_in(.2, self.update_data)
         self.mainloop.run()
 
-    def h_unhandled_input(self, key):
+    def _h_unhandled_input(self, key):
         """Handle keyboard input not otherwise handled."""
         if key == "esc":
             raise urwid.ExitMainLoop()
@@ -343,7 +345,8 @@ class PapersurferUi:
         """Open submit paper dialog."""
         self._pile = urwid.Pile(
             [
-                PostDialog(self.mtm, self.h_close_dialog, self.mainloop)
+                PostDialog(self.papersurfer.mattermost,
+                           self.h_close_dialog, self.mainloop)
             ]
         )
         self._over = urwid.Overlay(
@@ -496,10 +499,10 @@ class PostDialog(urwid.WidgetWrap):
 
 
 def get_version():
-    from pathlib import Path
+    """Get version number from static version text file."""
     pkgbase = Path(__file__).parent
-    with open(f"{pkgbase}/_version.txt", "r") as f:
-        return f.read()
+    with open(f"{pkgbase}/_version.txt", "r") as versionfile:
+        return versionfile.read()
 
 
 def parse_args():
-- 
GitLab