Merging upstream version 2.1.2~dev0+20230529.

Signed-off-by: Daniel Baumann <daniel@debian.org>

setup.cfg

@@ -1,5 +1,5 @@
 [sdist]
-formats = gztar, xztar
+formats=gztar, xztar
 
 [build_docs]
 source-dir = docs/source
@@ -15,32 +15,31 @@ builder = spelling
 [py2app]
 app = ['deluge/ui/ui_entry.py']
 arch = x86_64
+# arch = i386
 iconfile = packaging/osx/deluge.icns
 site-packages = false
 includes = glib, gio, cairo, pango, pangocairo, atk, gobject, gtk.keysyms,
-	twisted.internet, twisted.internet.utils, twisted.protocols,
-	zope.interface, mako.cache, email.mime, libtorrent, gtkosx_application,
-	HTMLParser
+           twisted.internet, twisted.internet.utils, twisted.protocols,
+           zope.interface, mako.cache, email.mime, libtorrent, gtkosx_application,
+           HTMLParser
 frameworks = CoreFoundation, Foundation, AppKit
 
 [flake8]
 max-line-length = 120
 builtins = _,_n,__request__
 extend-exclude = dist,build
-extend-ignore = 
-	A003,
-	E203,
-	N818
-per-file-ignores = 
-	deluge/ui/gtk3/*.py : E402
-	deluge/**/gtkui.py: E402
-	deluge/**/gtkui/*.py: E402
-	deluge/plugins/Stats/deluge_stats/graph.py: E402
-
+extend-ignore =
+# flake8-builtins: A003 class attribute is shadowing a python builtin
+    A003,
+# E203 whitespace before ':'
+    E203,
+# N818 pep8-naming: error suffix in exception names
+    N818
+per-file-ignores =
+# import not top of file (gi checks required before import)
+    deluge/ui/gtk3/*.py : E402
+    deluge/**/gtkui.py: E402
+    deluge/**/gtkui/*.py: E402
+    deluge/plugins/Stats/deluge_stats/graph.py: E402
 [pycodestyle]
 max-line-length = 88
-
-[egg_info]
-tag_build = 
-tag_date = 0
-