diff --git a/deluge/common.py b/deluge/common.py index ace19ad02..0775797e0 100644 --- a/deluge/common.py +++ b/deluge/common.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/config.py b/deluge/config.py index b0041fb60..6ec608f9b 100644 --- a/deluge/config.py +++ b/deluge/config.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/configmanager.py b/deluge/configmanager.py index 2870484b9..956849c37 100644 --- a/deluge/configmanager.py +++ b/deluge/configmanager.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/core/alertmanager.py b/deluge/core/alertmanager.py index b12dd96d1..91286b810 100644 --- a/deluge/core/alertmanager.py +++ b/deluge/core/alertmanager.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/core/autoadd.py b/deluge/core/autoadd.py index 213539203..1ad88ad7d 100644 --- a/deluge/core/autoadd.py +++ b/deluge/core/autoadd.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/core/core.py b/deluge/core/core.py index 5803f8fca..424608cdc 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/core/daemon.py b/deluge/core/daemon.py index e1196ad09..b88241a62 100644 --- a/deluge/core/daemon.py +++ b/deluge/core/daemon.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/core/pluginmanager.py b/deluge/core/pluginmanager.py index 8c80f6ba4..e24459be9 100644 --- a/deluge/core/pluginmanager.py +++ b/deluge/core/pluginmanager.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/core/signalmanager.py b/deluge/core/signalmanager.py index 9bf1bd0b0..ce0439ed9 100644 --- a/deluge/core/signalmanager.py +++ b/deluge/core/signalmanager.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index 173397404..4dbf8ef06 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, @@ -462,21 +462,21 @@ class Torrent: "remove_at_ratio": self.remove_at_ratio } - fns = { - "name": self.torrent_info.name, + fns = { + "name": self.torrent_info.name, "private": self.torrent_info.priv, - "total_size": self.torrent_info.total_size, - "num_files": self.torrent_info.num_files, - "num_pieces": self.torrent_info.num_pieces, - "piece_length": self.torrent_info.piece_length, - "eta": self.get_eta, - "ratio": self.get_ratio, + "total_size": self.torrent_info.total_size, + "num_files": self.torrent_info.num_files, + "num_pieces": self.torrent_info.num_pieces, + "piece_length": self.torrent_info.piece_length, + "eta": self.get_eta, + "ratio": self.get_ratio, "file_progress": self.get_file_progress, "queue": self.handle.queue_position, "is_seed": self.handle.is_seed, "peers": self.get_peers, "tracker_host": self.get_tracker_host - } + } self.status = None self.torrent_info = None @@ -492,7 +492,7 @@ class Torrent: for key in keys: if key in full_status: status_dict[key] = full_status[key] - elif key in fns: + elif key in fns: status_dict[key] = fns[key]() return status_dict diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index ee7319bf4..04bd7c58f 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/error.py b/deluge/error.py index 256962366..0002ce3f8 100644 --- a/deluge/error.py +++ b/deluge/error.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/log.py b/deluge/log.py index 2b74c62a9..062683c1c 100644 --- a/deluge/log.py +++ b/deluge/log.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/main.py b/deluge/main.py index 7345efb00..b1ad84b0a 100644 --- a/deluge/main.py +++ b/deluge/main.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/pluginmanagerbase.py b/deluge/pluginmanagerbase.py index 92f007191..163e3d570 100644 --- a/deluge/pluginmanagerbase.py +++ b/deluge/pluginmanagerbase.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/plugins/blocklist/blocklist/__init__.py b/deluge/plugins/blocklist/blocklist/__init__.py index 3baa6ea7e..6c7442933 100644 --- a/deluge/plugins/blocklist/blocklist/__init__.py +++ b/deluge/plugins/blocklist/blocklist/__init__.py @@ -9,7 +9,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/plugins/blocklist/blocklist/core.py b/deluge/plugins/blocklist/blocklist/core.py index 87ff292e3..f59378854 100644 --- a/deluge/plugins/blocklist/blocklist/core.py +++ b/deluge/plugins/blocklist/blocklist/core.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/plugins/blocklist/blocklist/gtkui.py b/deluge/plugins/blocklist/blocklist/gtkui.py index 779357362..427eb8744 100644 --- a/deluge/plugins/blocklist/blocklist/gtkui.py +++ b/deluge/plugins/blocklist/blocklist/gtkui.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/plugins/blocklist/blocklist/ui.py b/deluge/plugins/blocklist/blocklist/ui.py index 00ecab694..48d5e0b0b 100644 --- a/deluge/plugins/blocklist/blocklist/ui.py +++ b/deluge/plugins/blocklist/blocklist/ui.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/plugins/blocklist/setup.py b/deluge/plugins/blocklist/setup.py index 1d3a7e65e..d2ed89780 100644 --- a/deluge/plugins/blocklist/setup.py +++ b/deluge/plugins/blocklist/setup.py @@ -6,7 +6,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) +# the Free Software Foundation; either version 3, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful, diff --git a/deluge/plugins/coreclient.py b/deluge/plugins/coreclient.py index 9a152afc2..5f44011de 100644 --- a/deluge/plugins/coreclient.py +++ b/deluge/plugins/coreclient.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/plugins/corepluginbase.py b/deluge/plugins/corepluginbase.py index e6f393a17..d995f3c9b 100644 --- a/deluge/plugins/corepluginbase.py +++ b/deluge/plugins/corepluginbase.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/plugins/init.py b/deluge/plugins/init.py index 9a9098093..3c9506fc7 100644 --- a/deluge/plugins/init.py +++ b/deluge/plugins/init.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/plugins/testp/setup.py b/deluge/plugins/testp/setup.py index 2d972c15d..f9321314c 100644 --- a/deluge/plugins/testp/setup.py +++ b/deluge/plugins/testp/setup.py @@ -4,7 +4,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) +# the Free Software Foundation; either version 3, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful, diff --git a/deluge/plugins/testp/testp/__init__.py b/deluge/plugins/testp/testp/__init__.py index 37219e170..444b7d66f 100644 --- a/deluge/plugins/testp/testp/__init__.py +++ b/deluge/plugins/testp/testp/__init__.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/plugins/testp/testp/core.py b/deluge/plugins/testp/testp/core.py index 9660ccd91..55174fa69 100644 --- a/deluge/plugins/testp/testp/core.py +++ b/deluge/plugins/testp/testp/core.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/plugins/testp/testp/gtkui.py b/deluge/plugins/testp/testp/gtkui.py index da6d4582c..4cb921f21 100644 --- a/deluge/plugins/testp/testp/gtkui.py +++ b/deluge/plugins/testp/testp/gtkui.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/plugins/testp/testp/ui.py b/deluge/plugins/testp/testp/ui.py index 92ea56ecf..3b9efbc65 100644 --- a/deluge/plugins/testp/testp/ui.py +++ b/deluge/plugins/testp/testp/ui.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/client.py b/deluge/ui/client.py index 936fb0d9a..a693cd749 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -8,7 +8,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/aboutdialog.py b/deluge/ui/gtkui/aboutdialog.py index 2728b83c2..826aa7f14 100644 --- a/deluge/ui/gtkui/aboutdialog.py +++ b/deluge/ui/gtkui/aboutdialog.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, @@ -65,7 +65,7 @@ class AboutDialog: self.about.set_wrap_license(True) self.about.set_license(_("This program is free software; you can redistribute \ it and/or modify it under the terms of the GNU General Public License as published by \ -the Free Software Foundation; either version 2 of the License, or (at your option) any \ +the Free Software Foundation; either version 3 of the License, or (at your option) any \ later version. This program is distributed in the hope that it will be useful, but \ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS \ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You \ diff --git a/deluge/ui/gtkui/addtorrentdialog.py b/deluge/ui/gtkui/addtorrentdialog.py index 7f3275c4c..bbee9c469 100644 --- a/deluge/ui/gtkui/addtorrentdialog.py +++ b/deluge/ui/gtkui/addtorrentdialog.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/addtorrenturl.py b/deluge/ui/gtkui/addtorrenturl.py index 4b07fc8cc..b8b40b2f5 100644 --- a/deluge/ui/gtkui/addtorrenturl.py +++ b/deluge/ui/gtkui/addtorrenturl.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 438a8af1c..0273f568b 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/coreconfig.py b/deluge/ui/gtkui/coreconfig.py index ccb9658c7..5d960cc5f 100644 --- a/deluge/ui/gtkui/coreconfig.py +++ b/deluge/ui/gtkui/coreconfig.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/createtorrentdialog.py b/deluge/ui/gtkui/createtorrentdialog.py index 990ada2b9..812980571 100644 --- a/deluge/ui/gtkui/createtorrentdialog.py +++ b/deluge/ui/gtkui/createtorrentdialog.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/dbusinterface.py b/deluge/ui/gtkui/dbusinterface.py index 7ccc3b69b..0518fe435 100644 --- a/deluge/ui/gtkui/dbusinterface.py +++ b/deluge/ui/gtkui/dbusinterface.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/details_tab.py b/deluge/ui/gtkui/details_tab.py index 2fc7c6f17..ddbefb1aa 100644 --- a/deluge/ui/gtkui/details_tab.py +++ b/deluge/ui/gtkui/details_tab.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/edittrackersdialog.py b/deluge/ui/gtkui/edittrackersdialog.py index 64c2730a0..5a088c959 100644 --- a/deluge/ui/gtkui/edittrackersdialog.py +++ b/deluge/ui/gtkui/edittrackersdialog.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py index fb97c40bc..b97020487 100644 --- a/deluge/ui/gtkui/files_tab.py +++ b/deluge/ui/gtkui/files_tab.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 0292208b6..aacdc33bb 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/ipcinterface.py b/deluge/ui/gtkui/ipcinterface.py index efe0b4a9e..a9a6f5cfb 100644 --- a/deluge/ui/gtkui/ipcinterface.py +++ b/deluge/ui/gtkui/ipcinterface.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/listview.py b/deluge/ui/gtkui/listview.py index f0b15a3f5..18defb3c9 100644 --- a/deluge/ui/gtkui/listview.py +++ b/deluge/ui/gtkui/listview.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py index 370b78e86..55467f0eb 100644 --- a/deluge/ui/gtkui/mainwindow.py +++ b/deluge/ui/gtkui/mainwindow.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py index 4de3daebb..778d93be3 100644 --- a/deluge/ui/gtkui/menubar.py +++ b/deluge/ui/gtkui/menubar.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/new_release_dialog.py b/deluge/ui/gtkui/new_release_dialog.py index 1818b0939..5387c08a2 100644 --- a/deluge/ui/gtkui/new_release_dialog.py +++ b/deluge/ui/gtkui/new_release_dialog.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/notification.py b/deluge/ui/gtkui/notification.py index 494bd1385..c13b87a5e 100644 --- a/deluge/ui/gtkui/notification.py +++ b/deluge/ui/gtkui/notification.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/options_tab.py b/deluge/ui/gtkui/options_tab.py index 194c5d825..e27e47640 100644 --- a/deluge/ui/gtkui/options_tab.py +++ b/deluge/ui/gtkui/options_tab.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/peers_tab.py b/deluge/ui/gtkui/peers_tab.py index 838a4cecc..5f6f6922d 100644 --- a/deluge/ui/gtkui/peers_tab.py +++ b/deluge/ui/gtkui/peers_tab.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/pluginmanager.py b/deluge/ui/gtkui/pluginmanager.py index 1a77ac3c4..d273b9b9a 100644 --- a/deluge/ui/gtkui/pluginmanager.py +++ b/deluge/ui/gtkui/pluginmanager.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index ce989cb70..61baf03bf 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/queuedtorrents.py b/deluge/ui/gtkui/queuedtorrents.py index 7b10b330b..784793775 100644 --- a/deluge/ui/gtkui/queuedtorrents.py +++ b/deluge/ui/gtkui/queuedtorrents.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/removetorrentdialog.py b/deluge/ui/gtkui/removetorrentdialog.py index 8f2555585..1b74ebc21 100644 --- a/deluge/ui/gtkui/removetorrentdialog.py +++ b/deluge/ui/gtkui/removetorrentdialog.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/sidebar.py b/deluge/ui/gtkui/sidebar.py index 4ce5e27a8..b8149618c 100644 --- a/deluge/ui/gtkui/sidebar.py +++ b/deluge/ui/gtkui/sidebar.py @@ -8,7 +8,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/signals.py b/deluge/ui/gtkui/signals.py index 1cc9eb744..935b98aea 100644 --- a/deluge/ui/gtkui/signals.py +++ b/deluge/ui/gtkui/signals.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/statistics_tab.py b/deluge/ui/gtkui/statistics_tab.py index 595244aa2..7bb33151e 100644 --- a/deluge/ui/gtkui/statistics_tab.py +++ b/deluge/ui/gtkui/statistics_tab.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/statusbar.py b/deluge/ui/gtkui/statusbar.py index 182fa7a4c..c1b5e08a9 100644 --- a/deluge/ui/gtkui/statusbar.py +++ b/deluge/ui/gtkui/statusbar.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py index 451856ea7..c9681cd69 100644 --- a/deluge/ui/gtkui/systemtray.py +++ b/deluge/ui/gtkui/systemtray.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/toolbar.py b/deluge/ui/gtkui/toolbar.py index 9484a2d9e..3048a2522 100644 --- a/deluge/ui/gtkui/toolbar.py +++ b/deluge/ui/gtkui/toolbar.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/torrentdetails.py b/deluge/ui/gtkui/torrentdetails.py index 4ea5cffec..e2d8b2b8d 100644 --- a/deluge/ui/gtkui/torrentdetails.py +++ b/deluge/ui/gtkui/torrentdetails.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py index a0ca4f8ca..7e2ed9d39 100644 --- a/deluge/ui/gtkui/torrentview.py +++ b/deluge/ui/gtkui/torrentview.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/signalreceiver.py b/deluge/ui/signalreceiver.py index 9bad799d2..a4bba9160 100644 --- a/deluge/ui/signalreceiver.py +++ b/deluge/ui/signalreceiver.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/deluge/ui/ui.py b/deluge/ui/ui.py index 463fd33ee..006f63af4 100644 --- a/deluge/ui/ui.py +++ b/deluge/ui/ui.py @@ -7,7 +7,7 @@ # # You may redistribute it and/or modify it under the terms of the # GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) +# Foundation; either version 3 of the License, or (at your option) # any later version. # # deluge is distributed in the hope that it will be useful, diff --git a/setup.py b/setup.py index 766305980..04a34095d 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) +# the Free Software Foundation; either version 3, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful,