More linting rule fixes

wummel · Dec 1, 2023 · 8358491 · 8358491
1 parent 011d296
commit 8358491
Show file tree

Hide file tree

Showing 158 changed files with 11 additions and 165 deletions.
diff --git a/.ruff.toml b/.ruff.toml
@@ -4,6 +4,7 @@ select = [
     "B", # flake8-bugbear
     "I", # isort
     "D", # pydocstyle
+    "UP", # pyupgrade
 ]
 
 # Ignored rules

diff --git a/Makefile b/Makefile
@@ -148,11 +148,11 @@ checkchangelog:
 
 .PHONY: lint
 lint:
-	ruff setup.py patoolib tests
+	ruff setup.py patoolib tests doc/web/source
 
 .PHONY: reformat
 reformat:
-	ruff --fix setup.py patoolib tests
+	ruff --fix setup.py patoolib tests doc/web/source
 
 .PHONY: checkoutdated
 checkoutdated:

diff --git a/doc/web/source/conf.py b/doc/web/source/conf.py
@@ -1,8 +1,8 @@
-# Configuration file for the Sphinx documentation builder.
-#
-# For the full list of built-in configuration values, see the documentation:
-# https://www.sphinx-doc.org/en/master/usage/configuration.html
+"""Configuration file for the Sphinx documentation builder.
 
+For the full list of built-in configuration values, see the documentation:
+https://www.sphinx-doc.org/en/master/usage/configuration.html
+"""
 # -- Project information -----------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 

diff --git a/patoolib/__init__.py b/patoolib/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/cli.py b/patoolib/cli.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/fileutil.py b/patoolib/fileutil.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/log.py b/patoolib/log.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/mime.py b/patoolib/mime.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/__init__.py b/patoolib/programs/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/ar.py b/patoolib/programs/ar.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/arc.py b/patoolib/programs/arc.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/archmage.py b/patoolib/programs/archmage.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/arj.py b/patoolib/programs/arj.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/bsdcpio.py b/patoolib/programs/bsdcpio.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/bsdtar.py b/patoolib/programs/bsdtar.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/bzip2.py b/patoolib/programs/bzip2.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/bzip3.py b/patoolib/programs/bzip3.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/cabextract.py b/patoolib/programs/cabextract.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/chmlib.py b/patoolib/programs/chmlib.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/clzip.py b/patoolib/programs/clzip.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2011-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/compress.py b/patoolib/programs/compress.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/cpio.py b/patoolib/programs/cpio.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/dpkg.py b/patoolib/programs/dpkg.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/flac.py b/patoolib/programs/flac.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/genisoimage.py b/patoolib/programs/genisoimage.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2013-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/gzip.py b/patoolib/programs/gzip.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/isoinfo.py b/patoolib/programs/isoinfo.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2013-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/jar.py b/patoolib/programs/jar.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/lbzip2.py b/patoolib/programs/lbzip2.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/lcab.py b/patoolib/programs/lcab.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/lha.py b/patoolib/programs/lha.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/lhasa.py b/patoolib/programs/lhasa.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/lrzip.py b/patoolib/programs/lrzip.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/lz4.py b/patoolib/programs/lz4.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/lzip.py b/patoolib/programs/lzip.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/lzma.py b/patoolib/programs/lzma.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/lzop.py b/patoolib/programs/lzop.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/mac.py b/patoolib/programs/mac.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/nomarch.py b/patoolib/programs/nomarch.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/p7azip.py b/patoolib/programs/p7azip.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/p7rzip.py b/patoolib/programs/p7rzip.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2016-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/p7zip.py b/patoolib/programs/p7zip.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/pbzip2.py b/patoolib/programs/pbzip2.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/pdlzip.py b/patoolib/programs/pdlzip.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2011-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/pigz.py b/patoolib/programs/pigz.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/plzip.py b/patoolib/programs/plzip.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/py_bz2.py b/patoolib/programs/py_bz2.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/py_echo.py b/patoolib/programs/py_echo.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/py_gzip.py b/patoolib/programs/py_gzip.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/py_lzma.py b/patoolib/programs/py_lzma.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/py_tarfile.py b/patoolib/programs/py_tarfile.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/py_zipfile.py b/patoolib/programs/py_zipfile.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/rar.py b/patoolib/programs/rar.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/rpm.py b/patoolib/programs/rpm.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/rpm2cpio.py b/patoolib/programs/rpm2cpio.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/rzip.py b/patoolib/programs/rzip.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/shar.py b/patoolib/programs/shar.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/shorten.py b/patoolib/programs/shorten.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/star.py b/patoolib/programs/star.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/tar.py b/patoolib/programs/tar.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/unace.py b/patoolib/programs/unace.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/unadf.py b/patoolib/programs/unadf.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/unalz.py b/patoolib/programs/unalz.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/unar.py b/patoolib/programs/unar.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/uncompress.py b/patoolib/programs/uncompress.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/unrar.py b/patoolib/programs/unrar.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/unshar.py b/patoolib/programs/unshar.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2012-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/unzip.py b/patoolib/programs/unzip.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/xdms.py b/patoolib/programs/xdms.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2011-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/xz.py b/patoolib/programs/xz.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/zip.py b/patoolib/programs/zip.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/zoo.py b/patoolib/programs/zoo.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2010-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/zopfli.py b/patoolib/programs/zopfli.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2013-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/zpaq.py b/patoolib/programs/zpaq.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2014-2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/patoolib/programs/zstd.py b/patoolib/programs/zstd.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2023 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify