gpodder · elelay · Nov 24, 2020 · Jul 10, 2020 · Jul 11, 2020 · Jul 12, 2020
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,12 @@
 language: python
-dist: trusty
+dist: focal
 sudo: required
 python:
-    - "3.5"
+    - "3.8"
 install:
     - sudo apt-get update -q
     - sudo apt-get install intltool desktop-file-utils
-    - pip3 install coverage==4.5.4 minimock pycodestyle isort
+    - "pip3 install pytest-cov minimock pycodestyle 'isort<5.0' requests pytest pytest-httpserver"
     - python3 tools/localdepends.py
 script:
     - make lint

diff --git a/README.md b/README.md
@@ -29,6 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 - [Python 3.5](http://python.org/) or newer
 - [Podcastparser](http://gpodder.org/podcastparser/) 0.6.0 or newer
 - [mygpoclient](http://gpodder.org/mygpoclient/) 1.7 or newer
+- [requests](https://requests.readthedocs.io) 2.24.0 or newer
 - Python D-Bus bindings
 
 As an alternative to python-dbus on Mac OS X and Windows, you can use
@@ -66,7 +67,9 @@ PyPI. With this, you get a self-contained gPodder CLI codebase.
 ### Test Dependencies
 
 - python-minimock
-- python-coverage
+- pytest
+- pytest-httpserver
+- pytest-cov
 - desktop-file-utils
 
 ## Testing
@@ -85,9 +88,8 @@ Tests in gPodder are written in two different ways:
 - [unittests](http://docs.python.org/3/library/unittest.html)
 
 If you want to add doctests, simply write the doctest and make sure that
-the module appears in "doctest_modules" in src/gpodder/unittests.py. For
-example, the doctests in src/gpodder/util.py are added as 'util' (the
-"gpodder" prefix must not be specified there).
+the module appears after `--doctest-modules` in `pytest.ini`. If you
+add tests to any module in `src/gpodder` you have nothing to do.
 
 If you want to add unit tests for a specific module (ex: gpodder.model),
 you should add the tests as gpodder.test.model, or in other words:

diff --git a/bin/gpo b/bin/gpo
@@ -96,13 +96,13 @@ except ImportError:
     readline = None
 
 try:
-    import termios
     import fcntl
     import struct
+    import termios
 except ImportError:
-    termios = None
     fcntl = None
     struct = None
+    termios = None
 
 # A poor man's argparse/getopt - but it works for our use case :)
 verbose = False

diff --git a/makefile b/makefile
@@ -61,8 +61,10 @@ help:
 ##########################################################################
 
 unittest:
-	LC_ALL=C PYTHONPATH=src/ $(PYTHON) -m gpodder.unittests
+	LC_ALL=C PYTHONPATH=src/ pytest --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py
+	LC_ALL=C PYTHONPATH=src/ pytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient --cov=gpodder
 
+# ISORTOPTS := -c share src/gpodder tools bin/* *.py # for isort >= 5.0
 ISORTOPTS := -rc -c share src/gpodder tools bin/* *.py
 lint:
 	pycodestyle share src/gpodder tools bin/* *.py

diff --git a/pytest.ini b/pytest.ini
diff --git a/setup.cfg b/setup.cfg
@@ -5,5 +5,5 @@ select = W1, W2, W3, E11, E121, E122, E123, E124, E125, E127, E129, E13, E2, E3,
 max-line-length = 142
 
 [isort]
-known_third_party=dbus,gi,mutagen,cairo,requests,github3,jinja2,magic,youtube_dl,podcastparser,mygpoclient
+known_third_party=cairo,comtypes,dbus,gi,github3,jinja2,kaa,magic,mutagen,mygpoclient,podcastparser,requests,youtube_dl
 known_first_party=gpodder,soco
diff --git a/share/gpodder/extensions/rockbox_convert2mp4.py b/share/gpodder/extensions/rockbox_convert2mp4.py
@@ -15,8 +15,9 @@
 import shlex
 import subprocess
 
-import gpodder
 import kaa.metadata
+
+import gpodder
 from gpodder import util
 
 logger = logging.getLogger(__name__)

diff --git a/share/gpodder/extensions/taskbar_progress.py b/share/gpodder/extensions/taskbar_progress.py
@@ -26,9 +26,10 @@
                     c_ulong, c_ulonglong, c_ushort, c_wchar_p, sizeof)
 from ctypes.wintypes import tagRECT
 
-import gpodder
 from comtypes import COMMETHOD, GUID, IUnknown, client, wireHWND
 
+import gpodder
+
 _ = gpodder.gettext
 
 

diff --git a/src/gpodder/__init__.py b/src/gpodder/__init__.py
@@ -143,7 +143,7 @@ def __init__(self):
 SOCKET_TIMEOUT = 60
 socket.setdefaulttimeout(SOCKET_TIMEOUT)
 del socket
-del SOCKET_TIMEOUT
+SOCKET_TIMEOUT
 
 # Variables reserved for GUI-specific use (will be set accordingly)
 ui_folders = []
@@ -185,7 +185,8 @@ def fixup_home(old_home):
             old_home = new_home  # force to config directory
             print("D: windows-portable build; forcing home to config directory %s" % new_home, file=sys.stderr)
         else:  # ui.win32, not portable build
-            from gpodder.utilwin32ctypes import get_documents_folder, get_reg_current_user_string_value
+            from gpodder.utilwin32ctypes import (
+                get_documents_folder, get_reg_current_user_string_value)
             try:
                 # from old launcher, see
                 # https://github.com/gpodder/gpodder/blob/old/gtk2/tools/win32-launcher/folderselector.c

diff --git a/src/gpodder/coverart.py b/src/gpodder/coverart.py
@@ -85,7 +85,7 @@ def get_cover(self, filename, cover_url, feed_url, title,
 
             try:
                 logger.info('Downloading cover art: %s', cover_url)
-                data = util.urlopen(cover_url, timeout=self.TIMEOUT).read()
+                data = util.urlopen(cover_url, timeout=self.TIMEOUT).content
             except Exception as e:
                 logger.warn('Cover art download failed: %s', e)
                 return self._fallback_filename(title)

diff --git a/src/gpodder/directory.py b/src/gpodder/directory.py
@@ -89,7 +89,7 @@ def directory_entry_from_opml(url):
 
 def directory_entry_from_mygpo_json(url):
     return [DirectoryEntry(d['title'], d['url'], d['logo_url'], d['subscribers'], d['description'])
-            for d in json.load(util.urlopen(url))]
+            for d in util.urlopen(url).json()]
 
 
 class GPodderNetSearchProvider(Provider):
@@ -152,7 +152,7 @@ def on_tag(self, tag):
         return directory_entry_from_mygpo_json('http://gpodder.net/api/2/tag/%s/50.json' % urllib.parse.quote(tag))
 
     def get_tags(self):
-        return [DirectoryTag(d['tag'], d['usage']) for d in json.load(util.urlopen('http://gpodder.net/api/2/tags/40.json'))]
+        return [DirectoryTag(d['tag'], d['usage']) for d in util.urlopen('http://gpodder.net/api/2/tags/40.json').json()]
 
 
 class SoundcloudSearchProvider(Provider):