Deluge
diff options
| author | Andrew Resch <andrewresch@gmail.com> | 2008-11-23 04:58:01 +0000 |
|---|---|---|
| committer | Andrew Resch <andrewresch@gmail.com> | 2008-11-23 04:58:01 +0000 |
| commit | 80ab83b3639311820cc226e05a6d0136246882cd (patch) | |
| tree | 5087ff3d7583b5fcacb491b53aec61eb67175682 | |
| parent | bb4927d5138c4dec92753c124215d77efc54d549 (diff) | |
| download | deluge-80ab83b3639311820cc226e05a6d0136246882cd.tar.gz deluge-80ab83b3639311820cc226e05a6d0136246882cd.tar.bz2 deluge-80ab83b3639311820cc226e05a6d0136246882cd.zip | |
Remove OpenSSL exception from license headers
67 files changed, 126 insertions, 659 deletions
diff --git a/deluge/common.py b/deluge/common.py index 61ab0095a..bd5ea0f1d 100644 --- a/deluge/common.py +++ b/deluge/common.py @@ -1,7 +1,7 @@ # # common.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + """Common functions for various parts of Deluge to use.""" diff --git a/deluge/component.py b/deluge/component.py index b44db7c9d..bb3e3b399 100644 --- a/deluge/component.py +++ b/deluge/component.py @@ -1,7 +1,7 @@ # # component.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gobject from deluge.log import LOG as log diff --git a/deluge/config.py b/deluge/config.py index 752274974..4bf8d4983 100644 --- a/deluge/config.py +++ b/deluge/config.py @@ -1,7 +1,7 @@ # # config.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + """Configuration class used to access/create/modify configuration files.""" diff --git a/deluge/configmanager.py b/deluge/configmanager.py index 6fd94e191..c162b6f35 100644 --- a/deluge/configmanager.py +++ b/deluge/configmanager.py @@ -1,7 +1,7 @@ # # configmanager.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gobject import os diff --git a/deluge/core/alertmanager.py b/deluge/core/alertmanager.py index 1cdb769c1..971170cf8 100644 --- a/deluge/core/alertmanager.py +++ b/deluge/core/alertmanager.py @@ -1,7 +1,7 @@ # # alertmanager.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + """The AlertManager handles all the libtorrent alerts.""" diff --git a/deluge/core/autoadd.py b/deluge/core/autoadd.py index ef21cf547..7831f67e3 100644 --- a/deluge/core/autoadd.py +++ b/deluge/core/autoadd.py @@ -1,7 +1,7 @@ # # autoadd.py # -# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import os diff --git a/deluge/core/core.py b/deluge/core/core.py index b614d2a6c..38fd9ac75 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -1,7 +1,7 @@ # # core.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gettext import locale diff --git a/deluge/core/daemon.py b/deluge/core/daemon.py index d2fbf0d1e..4d05923fe 100644 --- a/deluge/core/daemon.py +++ b/deluge/core/daemon.py @@ -1,7 +1,7 @@ # # daemon.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import deluge.configmanager import deluge.common diff --git a/deluge/core/oldstateupgrader.py b/deluge/core/oldstateupgrader.py index ff2220ff5..65afecd0b 100644 --- a/deluge/core/oldstateupgrader.py +++ b/deluge/core/oldstateupgrader.py @@ -1,7 +1,7 @@ # # oldstateupgrader.py # -# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import os import os.path diff --git a/deluge/core/pluginmanager.py b/deluge/core/pluginmanager.py index 9401eb9fa..fb2dcc8d8 100644 --- a/deluge/core/pluginmanager.py +++ b/deluge/core/pluginmanager.py @@ -1,7 +1,7 @@ # # pluginmanager.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + """PluginManager for Core""" diff --git a/deluge/core/signalmanager.py b/deluge/core/signalmanager.py index c7655723d..cbbb7f7a0 100644 --- a/deluge/core/signalmanager.py +++ b/deluge/core/signalmanager.py @@ -1,7 +1,7 @@ # # signalmanager.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import deluge.xmlrpclib as xmlrpclib import socket diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index 9d4904d8e..52dc8303b 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -1,7 +1,7 @@ # # torrent.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + """Internal Torrent class""" diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index 9acd2d4c0..5aa352709 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -1,7 +1,7 @@ # # torrentmanager.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + """TorrentManager handles Torrent objects""" diff --git a/deluge/error.py b/deluge/error.py index d549219aa..cb63b5ca8 100644 --- a/deluge/error.py +++ b/deluge/error.py @@ -1,7 +1,7 @@ # # error.py # -# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + class DelugeError(Exception): def __init__(self, value): diff --git a/deluge/log.py b/deluge/log.py index 81b7a44e1..1076cf81e 100644 --- a/deluge/log.py +++ b/deluge/log.py @@ -1,7 +1,7 @@ # # log.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + """Logging functions""" diff --git a/deluge/main.py b/deluge/main.py index b31aced5f..6420382bd 100644 --- a/deluge/main.py +++ b/deluge/main.py @@ -1,7 +1,7 @@ # # main.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + # The main starting point for the program. This function is called when the # user runs the command 'deluge'. diff --git a/deluge/pluginmanagerbase.py b/deluge/pluginmanagerbase.py index 163e3d570..5422d420e 100644 --- a/deluge/pluginmanagerbase.py +++ b/deluge/pluginmanagerbase.py @@ -1,7 +1,7 @@ # # pluginmanagerbase.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + """PluginManagerBase""" diff --git a/deluge/plugins/blocklist/blocklist/__init__.py b/deluge/plugins/blocklist/blocklist/__init__.py index 0f98f5e72..ae3f8b0b3 100644 --- a/deluge/plugins/blocklist/blocklist/__init__.py +++ b/deluge/plugins/blocklist/blocklist/__init__.py @@ -1,7 +1,7 @@ # # blocklist/__init__.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # Copyright (C) 2008 Mark Stahler ('kramed') <markstahler@gmail.com> # # @@ -23,15 +23,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + from deluge.log import LOG as log diff --git a/deluge/plugins/blocklist/blocklist/core.py b/deluge/plugins/blocklist/blocklist/core.py index e9f5a8ca2..d7ab549c5 100644 --- a/deluge/plugins/blocklist/blocklist/core.py +++ b/deluge/plugins/blocklist/blocklist/core.py @@ -1,7 +1,7 @@ # # core.py # -# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import threading import urllib diff --git a/deluge/plugins/blocklist/blocklist/gtkui.py b/deluge/plugins/blocklist/blocklist/gtkui.py index d94624359..31440eccb 100644 --- a/deluge/plugins/blocklist/blocklist/gtkui.py +++ b/deluge/plugins/blocklist/blocklist/gtkui.py @@ -1,7 +1,7 @@ # # gtkui.py # -# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # diff --git a/deluge/plugins/blocklist/blocklist/ui.py b/deluge/plugins/blocklist/blocklist/ui.py index d21ba8cc2..527e5bcc1 100644 --- a/deluge/plugins/blocklist/blocklist/ui.py +++ b/deluge/plugins/blocklist/blocklist/ui.py @@ -1,7 +1,7 @@ # # ui.py # -# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import pkg_resources import os.path diff --git a/deluge/plugins/blocklist/blocklist/webui.py b/deluge/plugins/blocklist/blocklist/webui.py index 54069a193..de9feef0d 100644 --- a/deluge/plugins/blocklist/blocklist/webui.py +++ b/deluge/plugins/blocklist/blocklist/webui.py @@ -22,15 +22,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import os from deluge.log import LOG as log diff --git a/deluge/plugins/blocklist/setup.py b/deluge/plugins/blocklist/setup.py index d2ed89780..bec99a934 100644 --- a/deluge/plugins/blocklist/setup.py +++ b/deluge/plugins/blocklist/setup.py @@ -1,6 +1,6 @@ # setup.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # Copyright (C) 2008 Mark Stahler ('kramed') <markstahler@gmail.com> # @@ -20,15 +20,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + """ Download and import IP Blocklists diff --git a/deluge/plugins/corepluginbase.py b/deluge/plugins/corepluginbase.py index e21846ad3..1bc4be00d 100644 --- a/deluge/plugins/corepluginbase.py +++ b/deluge/plugins/corepluginbase.py @@ -1,7 +1,7 @@ # # core.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + from deluge.log import LOG as log diff --git a/deluge/plugins/init.py b/deluge/plugins/init.py index 540262540..e70049b97 100644 --- a/deluge/plugins/init.py +++ b/deluge/plugins/init.py @@ -1,7 +1,7 @@ # # init.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + from deluge.log import LOG as log diff --git a/deluge/plugins/label/label/__init__.py b/deluge/plugins/label/label/__init__.py index 19bf4c56b..b45be9826 100644 --- a/deluge/plugins/label/label/__init__.py +++ b/deluge/plugins/label/label/__init__.py @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + from deluge.log import LOG as log from deluge.plugins.init import PluginBase diff --git a/deluge/plugins/label/label/core.py b/deluge/plugins/label/label/core.py index c06adb285..611e2fa46 100644 --- a/deluge/plugins/label/label/core.py +++ b/deluge/plugins/label/label/core.py @@ -19,15 +19,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + """ torrent-label core plugin. diff --git a/deluge/plugins/label/label/gtk_sidebar.py b/deluge/plugins/label/label/gtk_sidebar.py index 5230f3b9b..a8e6d4800 100644 --- a/deluge/plugins/label/label/gtk_sidebar.py +++ b/deluge/plugins/label/label/gtk_sidebar.py @@ -2,7 +2,7 @@ # gtk_sidebar.py # # Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com> -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -22,15 +22,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gtk import gtk.glade diff --git a/deluge/plugins/label/label/gtkui.py b/deluge/plugins/label/label/gtkui.py index d53df8a2c..4e514bf07 100644 --- a/deluge/plugins/label/label/gtkui.py +++ b/deluge/plugins/label/label/gtkui.py @@ -1,7 +1,7 @@ # # blocklist/gtkui.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # Copyright (C) 2008 Mark Stahler ('kramed') <markstahler@gmail.com> # # Deluge is free software. @@ -22,15 +22,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import os import pkg_resources # access plugin egg diff --git a/deluge/plugins/label/label/ui.py b/deluge/plugins/label/label/ui.py index c03621f47..15e44bce8 100644 --- a/deluge/plugins/label/label/ui.py +++ b/deluge/plugins/label/label/ui.py @@ -1,7 +1,7 @@ # # blocklist/ui.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # Copyright (C) 2008 Mark Stahler ('kramed') <markstahler@gmail.com> # @@ -23,15 +23,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gettext import locale diff --git a/deluge/plugins/label/label/webui.py b/deluge/plugins/label/label/webui.py index fc6af38a8..3ace8c42d 100644 --- a/deluge/plugins/label/label/webui.py +++ b/deluge/plugins/label/label/webui.py @@ -22,15 +22,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import os from deluge.log import LOG as log diff --git a/deluge/plugins/label/label/webui_config.py b/deluge/plugins/label/label/webui_config.py index 33f8c6726..52917463e 100644 --- a/deluge/plugins/label/label/webui_config.py +++ b/deluge/plugins/label/label/webui_config.py @@ -19,15 +19,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import os from deluge.log import LOG as log diff --git a/deluge/plugins/label/label/webui_pages.py b/deluge/plugins/label/label/webui_pages.py index e1e585e7d..ddb50ecc8 100644 --- a/deluge/plugins/label/label/webui_pages.py +++ b/deluge/plugins/label/label/webui_pages.py @@ -20,15 +20,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import os from deluge.log import LOG as log diff --git a/deluge/plugins/label/setup.py b/deluge/plugins/label/setup.py index e69207ac4..f614b6731 100644 --- a/deluge/plugins/label/setup.py +++ b/deluge/plugins/label/setup.py @@ -18,15 +18,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + """ Label plugin. diff --git a/deluge/ui/client.py b/deluge/ui/client.py index 83e5b6e33..832b49291 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -1,7 +1,7 @@ # # client.py # -# Copyright (C) 2007/2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007/2008 Andrew Resch <andrewresch@gmail.com> # Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com> # # Deluge is free software. @@ -22,15 +22,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import os.path import socket diff --git a/deluge/ui/gtkui/aboutdialog.py b/deluge/ui/gtkui/aboutdialog.py index 2c1bbafae..42f34aaa7 100644 --- a/deluge/ui/gtkui/aboutdialog.py +++ b/deluge/ui/gtkui/aboutdialog.py @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import pygtk pygtk.require('2.0') diff --git a/deluge/ui/gtkui/addtorrentdialog.py b/deluge/ui/gtkui/addtorrentdialog.py index 23852efe9..909643f92 100644 --- a/deluge/ui/gtkui/addtorrentdialog.py +++ b/deluge/ui/gtkui/addtorrentdialog.py @@ -1,7 +1,7 @@ # # addtorrentdialog.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import pygtk pygtk.require('2.0') diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 6dae43b50..594bbae75 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -1,7 +1,7 @@ # # connectionmanager.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gtk, gtk.glade import pkg_resources diff --git a/deluge/ui/gtkui/coreconfig.py b/deluge/ui/gtkui/coreconfig.py index 5dce59ba3..72344076d 100644 --- a/deluge/ui/gtkui/coreconfig.py +++ b/deluge/ui/gtkui/coreconfig.py @@ -1,7 +1,7 @@ # # coreconfig.py # -# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import deluge.component as component from deluge.ui.client import aclient as client diff --git a/deluge/ui/gtkui/dbusinterface.py b/deluge/ui/gtkui/dbusinterface.py index e46bce696..4f9c59442 100644 --- a/deluge/ui/gtkui/dbusinterface.py +++ b/deluge/ui/gtkui/dbusinterface.py @@ -1,7 +1,7 @@ # # dbusinterface.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import sys import os diff --git a/deluge/ui/gtkui/details_tab.py b/deluge/ui/gtkui/details_tab.py index f54a27a6b..f5a7b6db5 100644 --- a/deluge/ui/gtkui/details_tab.py +++ b/deluge/ui/gtkui/details_tab.py @@ -1,7 +1,7 @@ # # details_tab.py # -# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gtk, gtk.glade diff --git a/deluge/ui/gtkui/edittrackersdialog.py b/deluge/ui/gtkui/edittrackersdialog.py index 9e8adc998..f6e51e0b6 100644 --- a/deluge/ui/gtkui/edittrackersdialog.py +++ b/deluge/ui/gtkui/edittrackersdialog.py @@ -1,7 +1,7 @@ # # edittrackersdialog.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gtk, gtk.glade import pkg_resources diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py index c2962b934..442a6dcca 100644 --- a/deluge/ui/gtkui/files_tab.py +++ b/deluge/ui/gtkui/files_tab.py @@ -1,7 +1,7 @@ # # files_tab.py # -# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gtk, gtk.glade import gobject diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 480e871e3..ced07edb2 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -1,7 +1,7 @@ # # gtkui.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + from deluge.log import LOG as log import pygtk diff --git a/deluge/ui/gtkui/ipcinterface.py b/deluge/ui/gtkui/ipcinterface.py index 7d24217a4..71479efd6 100644 --- a/deluge/ui/gtkui/ipcinterface.py +++ b/deluge/ui/gtkui/ipcinterface.py @@ -1,7 +1,7 @@ # # ipcinterface.py # -# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import sys import os.path diff --git a/deluge/ui/gtkui/listview.py b/deluge/ui/gtkui/listview.py index ed3b5bbc4..8ac4ba3ed 100644 --- a/deluge/ui/gtkui/listview.py +++ b/deluge/ui/gtkui/listview.py @@ -2,7 +2,7 @@ # # listview.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -22,15 +22,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import cPickle import os.path diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py index d466d2c4a..ae470c298 100644 --- a/deluge/ui/gtkui/mainwindow.py +++ b/deluge/ui/gtkui/mainwindow.py @@ -1,7 +1,7 @@ # # mainwindow.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import pygtk pygtk.require('2.0') diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py index 6d4028064..d55ec49fa 100644 --- a/deluge/ui/gtkui/menubar.py +++ b/deluge/ui/gtkui/menubar.py @@ -1,7 +1,7 @@ # # menubar.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import pygtk pygtk.require('2.0') diff --git a/deluge/ui/gtkui/new_release_dialog.py b/deluge/ui/gtkui/new_release_dialog.py index f5c92f12c..5b10bd34c 100644 --- a/deluge/ui/gtkui/new_release_dialog.py +++ b/deluge/ui/gtkui/new_release_dialog.py @@ -1,7 +1,7 @@ # # new_release_dialog.py # -# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import deluge.component as component import deluge.common diff --git a/deluge/ui/gtkui/options_tab.py b/deluge/ui/gtkui/options_tab.py index 9c7e62130..8a2ef34fc 100644 --- a/deluge/ui/gtkui/options_tab.py +++ b/deluge/ui/gtkui/options_tab.py @@ -1,7 +1,7 @@ # # options_tab.py # -# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import deluge.component as component from deluge.ui.client import aclient as client diff --git a/deluge/ui/gtkui/peers_tab.py b/deluge/ui/gtkui/peers_tab.py index fe0f58956..73961463e 100644 --- a/deluge/ui/gtkui/peers_tab.py +++ b/deluge/ui/gtkui/peers_tab.py @@ -1,7 +1,7 @@ # # peers_tab.py # -# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gtk, gtk.glade import os.path diff --git a/deluge/ui/gtkui/pluginmanager.py b/deluge/ui/gtkui/pluginmanager.py index 09b10d407..6f25d9499 100644 --- a/deluge/ui/gtkui/pluginmanager.py +++ b/deluge/ui/gtkui/pluginmanager.py @@ -1,7 +1,7 @@ # # pluginmanager.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import deluge.component as component import deluge.pluginmanagerbase diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index 96ec1beb9..39cbf315d 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -1,7 +1,7 @@ # # preferences.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import pygtk pygtk.require('2.0') diff --git a/deluge/ui/gtkui/queuedtorrents.py b/deluge/ui/gtkui/queuedtorrents.py index 351bc39d4..63405a7ab 100644 --- a/deluge/ui/gtkui/queuedtorrents.py +++ b/deluge/ui/gtkui/queuedtorrents.py @@ -1,7 +1,7 @@ # # queuedtorrents.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import os.path diff --git a/deluge/ui/gtkui/removetorrentdialog.py b/deluge/ui/gtkui/removetorrentdialog.py index 241063216..5488da846 100644 --- a/deluge/ui/gtkui/removetorrentdialog.py +++ b/deluge/ui/gtkui/removetorrentdialog.py @@ -1,7 +1,7 @@ # # removetorrentdialog.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gtk, gtk.glade import pkg_resources diff --git a/deluge/ui/gtkui/sidebar.py b/deluge/ui/gtkui/sidebar.py index 6ce00a7d2..45bf542ad 100644 --- a/deluge/ui/gtkui/sidebar.py +++ b/deluge/ui/gtkui/sidebar.py @@ -1,7 +1,7 @@ # # sidebar.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gtk import gtk.glade diff --git a/deluge/ui/gtkui/signals.py b/deluge/ui/gtkui/signals.py index f974ae92c..660aeaaa0 100644 --- a/deluge/ui/gtkui/signals.py +++ b/deluge/ui/gtkui/signals.py @@ -1,7 +1,7 @@ # # signals.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gtk diff --git a/deluge/ui/gtkui/statistics_tab.py b/deluge/ui/gtkui/statistics_tab.py index 31083a079..767c9a1ff 100644 --- a/deluge/ui/gtkui/statistics_tab.py +++ b/deluge/ui/gtkui/statistics_tab.py @@ -2,7 +2,7 @@ # # statistics_tab.py # -# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -22,15 +22,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gtk, gtk.glade diff --git a/deluge/ui/gtkui/statusbar.py b/deluge/ui/gtkui/statusbar.py index 8aff0199e..982d493f0 100644 --- a/deluge/ui/gtkui/statusbar.py +++ b/deluge/ui/gtkui/statusbar.py @@ -1,7 +1,7 @@ # # statusbar.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gtk import gobject diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py index 2869fd8c9..b46a1ed63 100644 --- a/deluge/ui/gtkui/systemtray.py +++ b/deluge/ui/gtkui/systemtray.py @@ -1,7 +1,7 @@ # # systemtray.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import gtk import pkg_resources diff --git a/deluge/ui/gtkui/toolbar.py b/deluge/ui/gtkui/toolbar.py index 87f6f09cd..b5c509b0f 100644 --- a/deluge/ui/gtkui/toolbar.py +++ b/deluge/ui/gtkui/toolbar.py @@ -1,7 +1,7 @@ # # toolbar.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import pygtk pygtk.require('2.0') diff --git a/deluge/ui/gtkui/torrentdetails.py b/deluge/ui/gtkui/torrentdetails.py index 08c130409..95fb93845 100644 --- a/deluge/ui/gtkui/torrentdetails.py +++ b/deluge/ui/gtkui/torrentdetails.py @@ -1,7 +1,7 @@ # # torrentdetails.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + """The torrent details component shows info about the selected torrent.""" diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py index 16257185b..a0242bf6a 100644 --- a/deluge/ui/gtkui/torrentview.py +++ b/deluge/ui/gtkui/torrentview.py @@ -1,7 +1,7 @@ # # torrentview.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + """The torrent view component that lists all torrents in the session.""" diff --git a/deluge/ui/signalreceiver.py b/deluge/ui/signalreceiver.py index 20220c9a7..14501f59c 100644 --- a/deluge/ui/signalreceiver.py +++ b/deluge/ui/signalreceiver.py @@ -1,7 +1,7 @@ # # signalreceiver.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import sys import socket diff --git a/deluge/ui/ui.py b/deluge/ui/ui.py index 874929cbd..89b53621d 100644 --- a/deluge/ui/ui.py +++ b/deluge/ui/ui.py @@ -1,7 +1,7 @@ # # ui.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + import deluge.configmanager diff --git a/deluge/ui/webui/webui.py b/deluge/ui/webui/webui.py index 9abf3a5cc..e53e25088 100644 --- a/deluge/ui/webui/webui.py +++ b/deluge/ui/webui/webui.py @@ -1,7 +1,7 @@ # # webui.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # Deluge is free software. # @@ -21,15 +21,7 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. + class WebUI: def __init__(self, args): @@ -1,6 +1,7 @@ +# # setup.py # -# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> +# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com> # # 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 @@ -18,15 +19,6 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. import ez_setup ez_setup.use_setuptools() @@ -295,7 +287,7 @@ setup( """, ext_package = "deluge", ext_modules = _ext_modules, - fullname = "Deluge Bittorent Client", + fullname = "Deluge Bittorrent Client", include_package_data = True, license = "GPLv3", name = "deluge", @@ -309,9 +301,7 @@ setup( "plugins/*.egg", "i18n/*.pot", "i18n/*/LC_MESSAGES/*.mo", - "ui/webui/LICENSE", "ui/webui/scripts/*", - "ui/webui/ssl/*", "ui/webui/static/*.css", "ui/webui/static/*.js", "ui/webui/static/images/*.png", @@ -320,9 +310,6 @@ setup( "ui/webui/static/images/tango/*.png", "ui/webui/templates/deluge/*", "ui/webui/templates/classic/*", - "ui/webui/templates/ajax_demo/*.cfg", - "ui/webui/templates/ajax_demo/*.html", - "ui/webui/templates/ajax_demo/static/js/*", "ui/webui/templates/white/*" ]}, packages = find_packages(exclude=["plugins"]), |