Merging upstream version 2.1.1 (Closes: #1026291).

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 136 insertions, 90 deletions

diff --git a/deluge.egg-info/PKG-INFO b/deluge.egg-info/PKG-INFO
index 3188609..1a9fda1 100644
--- a/deluge.egg-info/PKG-INFO
+++ b/deluge.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deluge
-Version: 2.0.3
+Version: 2.1.1
 Summary: BitTorrent Client
 Home-page: https://deluge-torrent.org
 Author: Deluge Team
@@ -12,72 +12,7 @@ Project-URL: Sourcecode, http://git.deluge-torrent.org/deluge
 Project-URL: Issues, https://dev.deluge-torrent.org/report/1
 Project-URL: Discussion, https://forum.deluge-torrent.org
 Project-URL: Documentation, https://deluge.readthedocs.io
-Description: # Deluge BitTorrent Client
-        
-        [![build-status]][travis-deluge] [![docs-status]][rtd-deluge]
-        
-        Deluge is a BitTorrent client that utilizes a daemon/client model.
-        It has various user interfaces available such as the GTK-UI, Web-UI and
-        a Console-UI. It uses [libtorrent][lt] at it's core to handle the BitTorrent
-        protocol.
-        
-        ## Install
-        
-        From [PyPi](https://pypi.org/project/deluge):
-        
-            pip install deluge
-        
-        From source code:
-        
-            python setup.py build
-            python setup.py install
-        
-        See [DEPENDS](DEPENDS.md) and [Installing/Source] for dependency details.
-        
-        ## Usage
-        
-        The various user-interfaces and Deluge daemon can be started with the following commands.
-        
-        Use the `--help` option for further command options.
-        
-        ### Gtk UI
-        
-        `deluge` or `deluge-gtk`
-        
-        ### Console UI
-        
-        `deluge-console`
-        
-        ### Web UI
-        
-        `deluge-web`
-        
-        Open http://localhost:8112 with default password `deluge`.
-        
-        ### Daemon
-        
-        `deluged`
-        
-        See the [Thinclient guide] to connect to the daemon from another computer.
-        
-        ## Contact
-        
-        - [Homepage](https://deluge-torrent.org)
-        - [User guide][user guide]
-        - [Forum](https://forum.deluge-torrent.org)
-        - [IRC Freenode #deluge](irc://irc.freenode.net/deluge)
-        
-        [user guide]: https://dev.deluge-torrent.org/wiki/UserGuide
-        [thinclient guide]: https://dev.deluge-torrent.org/wiki/UserGuide/ThinClient
-        [installing/source]: https://dev.deluge-torrent.org/wiki/Installing/Source
-        [build-status]: https://travis-ci.org/deluge-torrent/deluge.svg "Travis Status"
-        [travis-deluge]: https://travis-ci.org/deluge-torrent/deluge
-        [docs-status]: https://readthedocs.org/projects/deluge/badge/?version=develop
-        [rtd-deluge]: https://deluge.readthedocs.io/en/develop/?badge=develop "Documentation Status"
-        [lt]: https://libtorrent.org
-        
 Keywords: torrent bittorrent p2p fileshare filesharing
-Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Environment :: Web Environment
@@ -90,5 +25,80 @@ Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
 Classifier: Topic :: Internet
-Requires-Python: >=2.7
+Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+Provides-Extra: all
+License-File: LICENSE
+License-File: AUTHORS
+
+# Deluge BitTorrent Client
+
+[![build-status]][github-ci] [![docs-status]][rtd-deluge]
+
+Deluge is a BitTorrent client that utilizes a daemon/client model.
+It has various user interfaces available such as the GTK-UI, Web-UI and
+Console-UI. It uses [libtorrent][lt] at its core to handle the BitTorrent
+protocol.
+
+## Install
+
+From [PyPi](https://pypi.org/project/deluge):
+
+    pip install deluge
+
+with all optional dependencies:
+
+    pip install deluge[all]
+
+From source code:
+
+    pip install .
+
+with all optional dependencies:
+
+    pip install .[all]
+
+See [DEPENDS](DEPENDS.md) and [Installing/Source] for dependency details.
+
+## Usage
+
+The various user-interfaces and Deluge daemon can be started with the following commands.
+
+Use the `--help` option for further command options.
+
+### Gtk UI
+
+`deluge` or `deluge-gtk`
+
+### Console UI
+
+`deluge-console`
+
+### Web UI
+
+`deluge-web`
+
+Open http://localhost:8112 with default password `deluge`.
+
+### Daemon
+
+`deluged`
+
+See the [Thinclient guide] to connect to the daemon from another computer.
+
+## Contact
+
+- [Homepage](https://deluge-torrent.org)
+- [User guide][user guide]
+- [Forum](https://forum.deluge-torrent.org)
+- [IRC Libera.Chat #deluge](irc://irc.libera.chat/deluge)
+- [Discord](https://discord.gg/nwaHSE6tqn)
+
+[user guide]: https://dev.deluge-torrent.org/wiki/UserGuide
+[thinclient guide]: https://dev.deluge-torrent.org/wiki/UserGuide/ThinClient
+[installing/source]: https://dev.deluge-torrent.org/wiki/Installing/Source
+[build-status]: https://github.com/deluge-torrent/deluge/actions/workflows/ci.yml/badge.svg?branch=develop "CI"
+[github-ci]: https://github.com/deluge-torrent/deluge/actions/workflows/ci.yml
+[docs-status]: https://readthedocs.org/projects/deluge/badge/?version=latest
+[rtd-deluge]: https://deluge.readthedocs.io/en/latest/?badge=latest "Documentation Status"
+[lt]: https://libtorrent.org
diff --git a/deluge.egg-info/SOURCES.txt b/deluge.egg-info/SOURCES.txt
index 8389512..b26ac6a 100644
--- a/deluge.egg-info/SOURCES.txt
+++ b/deluge.egg-info/SOURCES.txt
@@ -8,6 +8,7 @@ RELEASE-VERSION
 gen_web_gettext.py
 minify_web_js.py
 msgfmt.py
+pyproject.toml
 setup.cfg
 setup.py
 version.py
@@ -19,6 +20,7 @@ deluge/common.py
 deluge/component.py
 deluge/config.py
 deluge/configmanager.py
+deluge/conftest.py
 deluge/crypto_utils.py
 deluge/decorators.py
 deluge/error.py
@@ -50,6 +52,7 @@ deluge/core/rpcserver.py
 deluge/core/torrent.py
 deluge/core/torrentmanager.py
 deluge/i18n/__init__.py
+deluge/i18n/af.po
 deluge/i18n/ar.po
 deluge/i18n/ast.po
 deluge/i18n/be.po
@@ -71,8 +74,10 @@ deluge/i18n/et.po
 deluge/i18n/eu.po
 deluge/i18n/fa.po
 deluge/i18n/fi.po
+deluge/i18n/fo.po
 deluge/i18n/fr.po
 deluge/i18n/fy.po
+deluge/i18n/ga.po
 deluge/i18n/gl.po
 deluge/i18n/he.po
 deluge/i18n/hi.po
@@ -85,18 +90,25 @@ deluge/i18n/iu.po
 deluge/i18n/ja.po
 deluge/i18n/ka.po
 deluge/i18n/kk.po
+deluge/i18n/km.po
 deluge/i18n/kn.po
 deluge/i18n/ko.po
 deluge/i18n/ku.po
+deluge/i18n/ky.po
 deluge/i18n/la.po
 deluge/i18n/languages.py
+deluge/i18n/lb.po
 deluge/i18n/lt.po
 deluge/i18n/lv.po
 deluge/i18n/mk.po
+deluge/i18n/ml.po
 deluge/i18n/ms.po
+deluge/i18n/nap.po
 deluge/i18n/nb.po
 deluge/i18n/nds.po
 deluge/i18n/nl.po
+deluge/i18n/nn.po
+deluge/i18n/oc.po
 deluge/i18n/pl.po
 deluge/i18n/pms.po
 deluge/i18n/pt.po
@@ -109,11 +121,13 @@ deluge/i18n/sl.po
 deluge/i18n/sr.po
 deluge/i18n/sv.po
 deluge/i18n/ta.po
+deluge/i18n/te.po
 deluge/i18n/th.po
 deluge/i18n/tl.po
 deluge/i18n/tlh.po
 deluge/i18n/tr.po
 deluge/i18n/uk.po
+deluge/i18n/ur.po
 deluge/i18n/util.py
 deluge/i18n/vi.po
 deluge/i18n/zh_CN.po
@@ -149,7 +163,6 @@ deluge/plugins/Blocklist/deluge_blocklist/data/blocklist16.png
 deluge/plugins/Blocklist/deluge_blocklist/data/blocklist_download24.png
 deluge/plugins/Blocklist/deluge_blocklist/data/blocklist_import24.png
 deluge/plugins/Blocklist/deluge_blocklist/data/blocklist_pref.ui
-deluge/plugins/Blocklist/deluge_blocklist/data/blocklist_pref.ui~
 deluge/plugins/Execute/setup.py
 deluge/plugins/Execute/deluge_execute/__init__.py
 deluge/plugins/Execute/deluge_execute/common.py
@@ -158,7 +171,6 @@ deluge/plugins/Execute/deluge_execute/gtkui.py
 deluge/plugins/Execute/deluge_execute/webui.py
 deluge/plugins/Execute/deluge_execute/data/execute.js
 deluge/plugins/Execute/deluge_execute/data/execute_prefs.ui
-deluge/plugins/Execute/deluge_execute/data/execute_prefs.ui~
 deluge/plugins/Extractor/setup.py
 deluge/plugins/Extractor/deluge_extractor/__init__.py
 deluge/plugins/Extractor/deluge_extractor/common.py
@@ -167,7 +179,6 @@ deluge/plugins/Extractor/deluge_extractor/gtkui.py
 deluge/plugins/Extractor/deluge_extractor/webui.py
 deluge/plugins/Extractor/deluge_extractor/data/extractor.js
 deluge/plugins/Extractor/deluge_extractor/data/extractor_prefs.ui
-deluge/plugins/Extractor/deluge_extractor/data/extractor_prefs.ui~
 deluge/plugins/Label/TODO
 deluge/plugins/Label/setup.py
 deluge/plugins/Label/deluge_label/__init__.py
@@ -191,7 +202,6 @@ deluge/plugins/Notifications/deluge_notifications/gtkui.py
 deluge/plugins/Notifications/deluge_notifications/test.py
 deluge/plugins/Notifications/deluge_notifications/webui.py
 deluge/plugins/Notifications/deluge_notifications/data/config.ui
-deluge/plugins/Notifications/deluge_notifications/data/config.ui~
 deluge/plugins/Notifications/deluge_notifications/data/notifications.js
 deluge/plugins/Scheduler/setup.py
 deluge/plugins/Scheduler/deluge_scheduler/__init__.py
@@ -211,7 +221,6 @@ deluge/plugins/Stats/deluge_stats/graph.py
 deluge/plugins/Stats/deluge_stats/gtkui.py
 deluge/plugins/Stats/deluge_stats/webui.py
 deluge/plugins/Stats/deluge_stats/data/config.ui
-deluge/plugins/Stats/deluge_stats/data/config.ui~
 deluge/plugins/Stats/deluge_stats/data/stats.js
 deluge/plugins/Stats/deluge_stats/data/tabs.ui
 deluge/plugins/Stats/deluge_stats/template/graph.html
@@ -231,11 +240,9 @@ deluge/plugins/WebUi/deluge_webui/common.py
 deluge/plugins/WebUi/deluge_webui/core.py
 deluge/plugins/WebUi/deluge_webui/gtkui.py
 deluge/plugins/WebUi/deluge_webui/data/config.ui
-deluge/plugins/WebUi/deluge_webui/data/config.ui~
 deluge/plugins/WebUi/deluge_webui/tests/__init__.py
 deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py
 deluge/tests/__init__.py
-deluge/tests/basetest.py
 deluge/tests/common.py
 deluge/tests/common_web.py
 deluge/tests/daemon_base.py
@@ -254,6 +261,7 @@ deluge/tests/test_httpdownloader.py
 deluge/tests/test_json_api.py
 deluge/tests/test_log.py
 deluge/tests/test_maketorrent.py
+deluge/tests/test_maybe_coroutine.py
 deluge/tests/test_metafile.py
 deluge/tests/test_plugin_metadata.py
 deluge/tests/test_rpcserver.py
@@ -267,6 +275,7 @@ deluge/tests/test_transfer.py
 deluge/tests/test_ui_common.py
 deluge/tests/test_ui_console.py
 deluge/tests/test_ui_entry.py
+deluge/tests/test_ui_gtk3.py
 deluge/tests/test_web_api.py
 deluge/tests/test_web_auth.py
 deluge/tests/test_webserver.py
@@ -274,13 +283,30 @@ deluge/tests/data/deluge.png
 deluge/tests/data/dir_with_6_files.torrent
 deluge/tests/data/filehash_field.torrent
 deluge/tests/data/google.ico
-deluge/tests/data/seo.ico
+deluge/tests/data/md5sum.torrent
+deluge/tests/data/seo.svg
 deluge/tests/data/test.torrent
 deluge/tests/data/test_torrent.file.torrent
+deluge/tests/data/testssl.sh
 deluge/tests/data/ubuntu-9.04-desktop-i386.iso.torrent
 deluge/tests/data/unicode_file.torrent
 deluge/tests/data/unicode_filenames.torrent
-deluge/tests/twisted/plugins/delugereporter.py
+deluge/tests/data/utf8_filename_torrents.state
+deluge/tests/data/etc/Apple.pem
+deluge/tests/data/etc/Java.pem
+deluge/tests/data/etc/Linux.pem
+deluge/tests/data/etc/Microsoft.pem
+deluge/tests/data/etc/Mozilla.pem
+deluge/tests/data/etc/README.md
+deluge/tests/data/etc/ca_hashes.txt
+deluge/tests/data/etc/cipher-mapping.txt
+deluge/tests/data/etc/client-simulation.txt
+deluge/tests/data/etc/client-simulation.wiresharked.md
+deluge/tests/data/etc/client-simulation.wiresharked.txt
+deluge/tests/data/etc/common-primes.txt
+deluge/tests/data/etc/curves.txt
+deluge/tests/data/etc/openssl.cnf
+deluge/tests/data/etc/tls_data.txt
 deluge/ui/__init__.py
 deluge/ui/client.py
 deluge/ui/common.py
@@ -350,7 +376,6 @@ deluge/ui/console/widgets/popup.py
 deluge/ui/console/widgets/sidebar.py
 deluge/ui/console/widgets/statusbars.py
 deluge/ui/console/widgets/window.py
-deluge/ui/data/__pycache__/__init__.cpython-37.pyc
 deluge/ui/data/icons/hicolor/128x128/apps/deluge.png
 deluge/ui/data/icons/hicolor/16x16/apps/deluge-panel.png
 deluge/ui/data/icons/hicolor/16x16/apps/deluge.png
@@ -388,7 +413,12 @@ deluge/ui/data/pixmaps/downloading16.png
 deluge/ui/data/pixmaps/inactive.svg
 deluge/ui/data/pixmaps/inactive16.png
 deluge/ui/data/pixmaps/loading.gif
-deluge/ui/data/pixmaps/magnet.png
+deluge/ui/data/pixmaps/magnet.svg
+deluge/ui/data/pixmaps/magnet16.png
+deluge/ui/data/pixmaps/magnet_add.svg
+deluge/ui/data/pixmaps/magnet_add16.png
+deluge/ui/data/pixmaps/magnet_copy.svg
+deluge/ui/data/pixmaps/magnet_copy16.png
 deluge/ui/data/pixmaps/queued.svg
 deluge/ui/data/pixmaps/queued16.png
 deluge/ui/data/pixmaps/seeding.svg
@@ -397,7 +427,6 @@ deluge/ui/data/pixmaps/tracker_all16.png
 deluge/ui/data/pixmaps/tracker_warning16.png
 deluge/ui/data/pixmaps/traffic.svg
 deluge/ui/data/pixmaps/traffic16.png
-deluge/ui/data/pixmaps/__pycache__/__init__.cpython-37.pyc
 deluge/ui/data/pixmaps/flags/ad.png
 deluge/ui/data/pixmaps/flags/ae.png
 deluge/ui/data/pixmaps/flags/af.png
@@ -702,6 +731,7 @@ deluge/ui/gtk3/glade/main_window.new_release.ui
 deluge/ui/gtk3/glade/main_window.tabs.menu_file.ui
 deluge/ui/gtk3/glade/main_window.tabs.menu_peer.ui
 deluge/ui/gtk3/glade/main_window.tabs.ui
+deluge/ui/gtk3/glade/main_window.tabs.ui~
 deluge/ui/gtk3/glade/main_window.ui
 deluge/ui/gtk3/glade/move_storage_dialog.ui
 deluge/ui/gtk3/glade/other_dialog.ui
@@ -728,7 +758,6 @@ deluge/ui/web/css/ext-extensions.css
 deluge/ui/web/icons/active.png
 deluge/ui/web/icons/add.png
 deluge/ui/web/icons/add_file.png
-deluge/ui/web/icons/add_magnet.png
 deluge/ui/web/icons/add_url.png
 deluge/ui/web/icons/alert.png
 deluge/ui/web/icons/all.png
@@ -762,6 +791,9 @@ deluge/ui/web/icons/install_plugin.png
 deluge/ui/web/icons/login.png
 deluge/ui/web/icons/logout.png
 deluge/ui/web/icons/low.png
+deluge/ui/web/icons/magnet.png
+deluge/ui/web/icons/magnet_add.png
+deluge/ui/web/icons/magnet_copy.png
 deluge/ui/web/icons/move.png
 deluge/ui/web/icons/no_download.png
 deluge/ui/web/icons/normal.png
@@ -784,6 +816,7 @@ deluge/ui/web/images/s.gif
 deluge/ui/web/images/spinner-split.gif
 deluge/ui/web/images/spinner.gif
 deluge/ui/web/js/deluge-all-debug.js
+deluge/ui/web/js/deluge-all.js
 deluge/ui/web/js/gettext.js
 deluge/ui/web/js/deluge-all/.order
 deluge/ui/web/js/deluge-all/AboutWindow.js
@@ -791,6 +824,7 @@ deluge/ui/web/js/deluge-all/AddConnectionWindow.js
 deluge/ui/web/js/deluge-all/AddTrackerWindow.js
 deluge/ui/web/js/deluge-all/Client.js
 deluge/ui/web/js/deluge-all/ConnectionManager.js
+deluge/ui/web/js/deluge-all/CopyMagnetWindow.js
 deluge/ui/web/js/deluge-all/Deluge.js
 deluge/ui/web/js/deluge-all/EditConnectionWindow.js
 deluge/ui/web/js/deluge-all/EditTrackerWindow.js
@@ -851,6 +885,7 @@ deluge/ui/web/js/extjs/ext-all.js
 deluge/ui/web/js/extjs/ext-base-debug.js
 deluge/ui/web/js/extjs/ext-base.js
 deluge/ui/web/js/extjs/ext-extensions-debug.js
+deluge/ui/web/js/extjs/ext-extensions.js
 deluge/ui/web/js/extjs/ext-extensions/JSLoader.js
 deluge/ui/web/js/extjs/ext-extensions/Spinner.js
 deluge/ui/web/js/extjs/ext-extensions/StatusBar.js
@@ -1390,4 +1425,6 @@ docs/man/deluge.1
 docs/man/deluged.1
 packaging/systemd/deluge-web.service
 packaging/systemd/deluged.service
-packaging/systemd/user.conf
\ No newline at end of file
+packaging/systemd/user.conf
+packaging/systemd/user/deluge-web.service
+packaging/systemd/user/deluged.service
\ No newline at end of file
diff --git a/deluge.egg-info/entry_points.txt b/deluge.egg-info/entry_points.txt
index 69bb60b..05bd38e 100644
--- a/deluge.egg-info/entry_points.txt
+++ b/deluge.egg-info/entry_points.txt
@@ -1,7 +1,5 @@
 [console_scripts]
 deluge-console = deluge.ui.console:start
-deluge-web = deluge.ui.web:start
-deluged = deluge.core.daemon_entry:start_daemon
 
 [deluge.ui]
 console = deluge.ui.console:Console
@@ -11,4 +9,5 @@ web = deluge.ui.web:Web
 [gui_scripts]
 deluge = deluge.ui.ui_entry:start_ui
 deluge-gtk = deluge.ui.gtk3:start
-
+deluge-web = deluge.ui.web:start
+deluged = deluge.core.daemon_entry:start_daemon
diff --git a/deluge.egg-info/requires.txt b/deluge.egg-info/requires.txt
index 9e1db94..13709bf 100644
--- a/deluge.egg-info/requires.txt
+++ b/deluge.egg-info/requires.txt
@@ -3,16 +3,16 @@ pyasn1
 rencode
 pyopenssl
 pyxdg
-pillow
 mako
-chardet
-six
-setproctitle
+setuptools
 zope.interface
 
 [:sys_platform == "win32"]
 pywin32
 certifi
 
-[:sys_platform == "win32" and python_version == "2"]
-py2-ipaddress
+[all]
+setproctitle
+pillow
+chardet
+ifaddr