change copyright notices to gpl3

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,
@@ -432,20 +432,20 @@ class Torrent:
             "remove_at_ratio": self.remove_at_ratio
         }
         
-        fns = {
+        fns = {
-            "name": self.torrent_info.name,
+            "name": self.torrent_info.name,
             "private": self.torrent_info.priv,
-            "total_size": self.torrent_info.total_size,
+            "total_size": self.torrent_info.total_size,
-            "num_files": self.torrent_info.num_files,
+            "num_files": self.torrent_info.num_files,
-            "num_pieces": self.torrent_info.num_pieces,
+            "num_pieces": self.torrent_info.num_pieces,
-            "piece_length": self.torrent_info.piece_length,
+            "piece_length": self.torrent_info.piece_length,
-            "eta": self.get_eta,
+            "eta": self.get_eta,
-            "ratio": self.get_ratio,
+            "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,
-        }
+        }
 
         self.status = None
         self.torrent_info = None
@@ -461,7 +461,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

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,

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,

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,

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,

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,

deluge/plugins/blocklist/blocklist/__init__.py

@@ -3,13 +3,13 @@
 #
 # Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com>
 # Copyright (C) 2008 Mark Stahler ('kramed') <markstahler@gmail.com>
-
+#
 #
 # Deluge is free software.
 #
 # 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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

deluge/ui/gtkui/sidebar.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,

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,

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,

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,

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,

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,

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,

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,

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,

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,