diff --git a/deluge/common.py b/deluge/common.py index 942ced94f..479ef9a50 100644 --- a/deluge/common.py +++ b/deluge/common.py @@ -1,7 +1,7 @@ # # common.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') +# Copyright (C) 2007, 2008 Andrew Resch # # 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') +# Copyright (C) 2007, 2008 Andrew Resch # # 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 e18b2545b..99f073501 100644 --- a/deluge/config.py +++ b/deluge/config.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. + """ Deluge Config Module 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') +# Copyright (C) 2007 Andrew Resch # # 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 2136c86cb..dddb73a5e 100644 --- a/deluge/core/alertmanager.py +++ b/deluge/core/alertmanager.py @@ -1,7 +1,7 @@ # # alertmanager.py # -# Copyright (C) 2007 Andrew Resch ('andar') +# Copyright (C) 2007 Andrew Resch # # 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 57b4a9020..60e7a3559 100644 --- a/deluge/core/autoadd.py +++ b/deluge/core/autoadd.py @@ -1,7 +1,7 @@ # # autoadd.py # -# Copyright (C) 2008 Andrew Resch ('andar') +# Copyright (C) 2008 Andrew Resch # # 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 6064ef85f..b838bd73f 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -1,7 +1,7 @@ # # core.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') +# Copyright (C) 2007, 2008 Andrew Resch # # 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') +# Copyright (C) 2007 Andrew Resch # # 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/filtermanager.py b/deluge/core/filtermanager.py index e43da08b0..7932507f3 100644 --- a/deluge/core/filtermanager.py +++ b/deluge/core/filtermanager.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 deluge.component as component from deluge.log import LOG as log 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') +# Copyright (C) 2008 Andrew Resch # # 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') +# Copyright (C) 2007 Andrew Resch # # 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/preferencesmanager.py b/deluge/core/preferencesmanager.py index dd7750f9c..a66bf707b 100644 --- a/deluge/core/preferencesmanager.py +++ b/deluge/core/preferencesmanager.py @@ -1,7 +1,7 @@ # # preferencesmanager.py # -# Copyright (C) 2008 Andrew Resch ('andar') +# Copyright (C) 2008 Andrew Resch # # 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 import threading diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index 6ebdb8a20..a927b7b93 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.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 gobject diff --git a/deluge/core/signalmanager.py b/deluge/core/signalmanager.py index fabfbe975..78fa291a6 100644 --- a/deluge/core/signalmanager.py +++ b/deluge/core/signalmanager.py @@ -1,7 +1,7 @@ # # signalmanager.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') +# Copyright (C) 2007, 2008 Andrew Resch # # 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 0fd09a54a..24534552c 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -1,7 +1,7 @@ # # torrent.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') +# Copyright (C) 2007, 2008 Andrew Resch # # 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 dced0e02d..fd0bebc80 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -1,7 +1,7 @@ # # torrentmanager.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') +# Copyright (C) 2007, 2008 Andrew Resch # # 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') +# Copyright (C) 2008 Andrew Resch # # 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') +# Copyright (C) 2007 Andrew Resch # # 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 0dd91b750..c43976194 100644 --- a/deluge/main.py +++ b/deluge/main.py @@ -1,7 +1,7 @@ # # main.py # -# Copyright (C) 2007 Andrew Resch ('andar') +# Copyright (C) 2007 Andrew Resch # # 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 868a4249c..0817281e2 100644 --- a/deluge/pluginmanagerbase.py +++ b/deluge/pluginmanagerbase.py @@ -1,7 +1,7 @@ # # pluginmanagerbase.py # -# Copyright (C) 2007 Andrew Resch ('andar') +# Copyright (C) 2007 Andrew Resch # # 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 6c7442933..fe2b54edf 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') +# Copyright (C) 2007 Andrew Resch # Copyright (C) 2008 Mark Stahler ('kramed') # @@ -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 73df405e3..3c9792d57 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') +# Copyright (C) 2008 Andrew Resch # # 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') +# Copyright (C) 2008 Andrew Resch # # 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') +# Copyright (C) 2008 Andrew Resch # # 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 e14b155bf..5d28a1422 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 9475cf43e..fb720923b 100644 --- a/deluge/plugins/blocklist/setup.py +++ b/deluge/plugins/blocklist/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. + from setuptools import setup diff --git a/deluge/plugins/coreclient.py b/deluge/plugins/coreclient.py index 5f44011de..d39778098 100644 --- a/deluge/plugins/coreclient.py +++ b/deluge/plugins/coreclient.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 deluge.component as component 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') +# Copyright (C) 2007 Andrew Resch # # 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 29185d3e9..533a33f84 100644 --- a/deluge/plugins/init.py +++ b/deluge/plugins/init.py @@ -1,7 +1,7 @@ # # init.py # -# Copyright (C) 2007 Andrew Resch ('andar') +# Copyright (C) 2007 Andrew Resch # # 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 752bf0a0f..4d63a7624 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/gtkui/__init__.py b/deluge/plugins/label/label/gtkui/__init__.py index 839741ded..baa85efab 100644 --- a/deluge/plugins/label/label/gtkui/__init__.py +++ b/deluge/plugins/label/label/gtkui/__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. + import os import pkg_resources # access plugin egg diff --git a/deluge/plugins/label/label/gtkui/label_config.py b/deluge/plugins/label/label/gtkui/label_config.py index 06f476f69..b242c1f02 100644 --- a/deluge/plugins/label/label/gtkui/label_config.py +++ b/deluge/plugins/label/label/gtkui/label_config.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 gtk import gtk.glade diff --git a/deluge/plugins/label/label/gtkui/sidebar_menu.py b/deluge/plugins/label/label/gtkui/sidebar_menu.py index 41f91d5dc..de768e695 100644 --- a/deluge/plugins/label/label/gtkui/sidebar_menu.py +++ b/deluge/plugins/label/label/gtkui/sidebar_menu.py @@ -2,7 +2,7 @@ # gtk_sidebar.py # # Copyright (C) 2008 Martijn Voncken -# Copyright (C) 2007 Andrew Resch ('andar') +# Copyright (C) 2007 Andrew Resch # # 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/submenu.py b/deluge/plugins/label/label/gtkui/submenu.py index 595a6c29c..657d10644 100644 --- a/deluge/plugins/label/label/gtkui/submenu.py +++ b/deluge/plugins/label/label/gtkui/submenu.py @@ -1,7 +1,7 @@ # # blocklist/gtkui.py # -# Copyright (C) 2007 Andrew Resch ('andar') +# Copyright (C) 2007 Andrew Resch # Copyright (C) 2008 Mark Stahler ('kramed') # # 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/gtkui/ui.py b/deluge/plugins/label/label/gtkui/ui.py index c03621f47..15e44bce8 100644 --- a/deluge/plugins/label/label/gtkui/ui.py +++ b/deluge/plugins/label/label/gtkui/ui.py @@ -1,7 +1,7 @@ # # blocklist/ui.py # -# Copyright (C) 2007 Andrew Resch ('andar') +# Copyright (C) 2007 Andrew Resch # Copyright (C) 2008 Mark Stahler ('kramed') # @@ -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 721018c85..c20cab1c4 100644 --- a/deluge/plugins/label/label/webui.py +++ b/deluge/plugins/label/label/webui.py @@ -5,7 +5,7 @@ # # Basic plugin template created by: # Copyright (C) 2008 Martijn Voncken -# Copyright (C) 2007, 2008 Andrew Resch ('andar') +# Copyright (C) 2007, 2008 Andrew Resch # # Deluge is free software. # diff --git a/deluge/plugins/label/setup.py b/deluge/plugins/label/setup.py index 70424fcf0..f6994a37f 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. + from setuptools import setup diff --git a/deluge/plugins/stats/setup.py b/deluge/plugins/stats/setup.py index b025a5c8e..b10c305f8 100644 --- a/deluge/plugins/stats/setup.py +++ b/deluge/plugins/stats/setup.py @@ -5,7 +5,7 @@ # # Basic plugin template created by: # Copyright (C) 2008 Martijn Voncken -# Copyright (C) 2007, 2008 Andrew Resch ('andar') +# Copyright (C) 2007, 2008 Andrew Resch # # Deluge is free software. # diff --git a/deluge/plugins/stats/stats/__init__.py b/deluge/plugins/stats/stats/__init__.py index fdbca7681..e2718bbb4 100644 --- a/deluge/plugins/stats/stats/__init__.py +++ b/deluge/plugins/stats/stats/__init__.py @@ -5,7 +5,7 @@ # # Basic plugin template created by: # Copyright (C) 2008 Martijn Voncken -# Copyright (C) 2007, 2008 Andrew Resch ('andar') +# Copyright (C) 2007, 2008 Andrew Resch # # Deluge is free software. # diff --git a/deluge/plugins/stats/stats/gtkui.py b/deluge/plugins/stats/stats/gtkui.py index 9a58fe2fb..d57169a00 100644 --- a/deluge/plugins/stats/stats/gtkui.py +++ b/deluge/plugins/stats/stats/gtkui.py @@ -5,7 +5,7 @@ # # Basic plugin template created by: # Copyright (C) 2008 Martijn Voncken -# Copyright (C) 2007, 2008 Andrew Resch ('andar') +# Copyright (C) 2007, 2008 Andrew Resch # # Deluge is free software. # diff --git a/deluge/plugins/stats/stats/webui.py b/deluge/plugins/stats/stats/webui.py index 75636d092..6eb56a1b3 100644 --- a/deluge/plugins/stats/stats/webui.py +++ b/deluge/plugins/stats/stats/webui.py @@ -5,7 +5,7 @@ # # Basic plugin template created by: # Copyright (C) 2008 Martijn Voncken -# Copyright (C) 2007, 2008 Andrew Resch ('andar') +# Copyright (C) 2007, 2008 Andrew Resch # # Deluge is free software. # diff --git a/deluge/plugins/webuipluginbase.py b/deluge/plugins/webuipluginbase.py index 14d79bc7d..a17568a33 100644 --- a/deluge/plugins/webuipluginbase.py +++ b/deluge/plugins/webuipluginbase.py @@ -1,7 +1,7 @@ # # webuipluginbase.py # -# Copyright (C) 2008 Andrew Resch ('andar') +# Copyright (C) 2008 Andrew Resch # # 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/scripts/create_plugin.py b/deluge/scripts/create_plugin.py index d45dccf0a..234b4fe63 100644 --- a/deluge/scripts/create_plugin.py +++ b/deluge/scripts/create_plugin.py @@ -323,7 +323,7 @@ GPL = """# # # Basic plugin template created by: # Copyright (C) 2008 Martijn Voncken -# Copyright (C) 2007, 2008 Andrew Resch ('andar') +# Copyright (C) 2007, 2008 Andrew Resch # # Deluge is free software. # diff --git a/deluge/ui/client.py b/deluge/ui/client.py index c890a486c..c7b01ad09 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -1,7 +1,7 @@ # # client.py # -# Copyright (C) 2007/2008 Andrew Resch ('andar') +# Copyright (C) 2007/2008 Andrew Resch # Copyright (C) 2008 Martijn Voncken # # 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 510d81447..f35eb5973 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 966f792f1..6805cdfbd 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') +# Copyright (C) 2007 Andrew Resch # # 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/common.py b/deluge/ui/gtkui/common.py index 12399e638..dd7153a15 100644 --- a/deluge/ui/gtkui/common.py +++ b/deluge/ui/gtkui/common.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. + """Common functions for various parts of gtkui to use.""" import pygtk diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 35d20453e..3b17ee686 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') +# Copyright (C) 2007 Andrew Resch # # 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') +# Copyright (C) 2008 Andrew Resch # # 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/createtorrentdialog.py b/deluge/ui/gtkui/createtorrentdialog.py index 6252bb70b..3265813b5 100644 --- a/deluge/ui/gtkui/createtorrentdialog.py +++ b/deluge/ui/gtkui/createtorrentdialog.py @@ -1,7 +1,7 @@ # # createtorrentdialog.py # -# Copyright (C) 2008 Andrew Resch ('andar') +# Copyright (C) 2008 Andrew Resch # # 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/dbusinterface.py b/deluge/ui/gtkui/dbusinterface.py index 8b0a5998d..52c75b758 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') +# Copyright (C) 2007 Andrew Resch # # 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') +# Copyright (C) 2008 Andrew Resch # # 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 988e0be9f..a43d132f8 100644 --- a/deluge/ui/gtkui/edittrackersdialog.py +++ b/deluge/ui/gtkui/edittrackersdialog.py @@ -1,7 +1,7 @@ # # edittrackersdialog.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') +# Copyright (C) 2007, 2008 Andrew Resch # # 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 bfe172718..433cd05da 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') +# Copyright (C) 2008 Andrew Resch # # 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/filtertreeview.py b/deluge/ui/gtkui/filtertreeview.py index afb0ddc20..016ee67d1 100644 --- a/deluge/ui/gtkui/filtertreeview.py +++ b/deluge/ui/gtkui/filtertreeview.py @@ -2,7 +2,7 @@ # gtk_sidebar.py # # Copyright (C) 2008 Martijn Voncken -# Copyright (C) 2007 Andrew Resch ('andar') +# Copyright (C) 2007 Andrew Resch # # 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/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 9418e56d1..6074fbe9f 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') +# Copyright (C) 2007 Andrew Resch # # 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 28485c434..4ed30b704 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') +# Copyright (C) 2008 Andrew Resch # # 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 e822c0f4d..6a5f5a539 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') +# Copyright (C) 2007, 2008 Andrew Resch # # 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 41d7a9902..9f20d76e0 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') +# Copyright (C) 2007 Andrew Resch # # 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 5e9cd11be..77ed93de0 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') +# Copyright (C) 2007, 2008 Andrew Resch # # 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') +# Copyright (C) 2008 Andrew Resch # # 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/notification.py b/deluge/ui/gtkui/notification.py index 7da26a7bd..b7c2ad9b2 100644 --- a/deluge/ui/gtkui/notification.py +++ b/deluge/ui/gtkui/notification.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 deluge.component as component import deluge.common diff --git a/deluge/ui/gtkui/options_tab.py b/deluge/ui/gtkui/options_tab.py index 8f27e664e..bbdca6e3d 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') +# Copyright (C) 2008 Andrew Resch # # 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 749fffac0..3d36fc665 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') +# Copyright (C) 2008 Andrew Resch # # 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') +# Copyright (C) 2007, 2008 Andrew Resch # # 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 d7b6b34d0..25d68cbef 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') +# Copyright (C) 2007, 2008 Andrew Resch # # 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 8740a77ae..22f8423e3 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') +# Copyright (C) 2007 Andrew Resch # # 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 16853ec12..75b9033cb 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') +# Copyright (C) 2007 Andrew Resch # # 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 0e994ed10..b619625fb 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') +# Copyright (C) 2007 Andrew Resch # Copyright (C) 2008 Martijn Voncken # # 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/ui/gtkui/signals.py b/deluge/ui/gtkui/signals.py index d587b9353..f3dbdee24 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') +# Copyright (C) 2007, 2008 Andrew Resch # # 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 e36cdc087..ad0b7f33d 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') +# Copyright (C) 2008 Andrew Resch # # 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 12949ac96..0f07b30b6 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') +# Copyright (C) 2007, 2008 Andrew Resch # # 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 5fc4e5a98..9a0cc3654 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') +# Copyright (C) 2007, 2008 Andrew Resch # # 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') +# Copyright (C) 2007, 2008 Andrew Resch # # 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 fe03f61d1..4ce4cec48 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') +# Copyright (C) 2007 Andrew Resch # # 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 dfe2582a5..0871cffed 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') +# Copyright (C) 2007, 2008 Andrew Resch # # 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 2f1eba934..4353e5b59 100644 --- a/deluge/ui/signalreceiver.py +++ b/deluge/ui/signalreceiver.py @@ -1,7 +1,7 @@ # # signalreceiver.py # -# Copyright (C) 2007, 2008 Andrew Resch ('andar') +# Copyright (C) 2007, 2008 Andrew Resch # # 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/tracker_icons.py b/deluge/ui/tracker_icons.py index 50ea42c0c..f0ec62410 100644 --- a/deluge/ui/tracker_icons.py +++ b/deluge/ui/tracker_icons.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 threading diff --git a/deluge/ui/ui.py b/deluge/ui/ui.py index 23e32d40c..5f4ac949a 100644 --- a/deluge/ui/ui.py +++ b/deluge/ui/ui.py @@ -1,7 +1,7 @@ # # ui.py # -# Copyright (C) 2007 Andrew Resch ('andar') +# Copyright (C) 2007 Andrew Resch # # 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 fa6cafa9a..2619f65d7 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') +# Copyright (C) 2007 Andrew Resch # # 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): diff --git a/setup.py b/setup.py index 10bb1cae6..ef684a943 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,7 @@ +# # setup.py # -# Copyright (C) 2007 Andrew Resch ('andar') +# Copyright (C) 2007 Andrew Resch # # 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() @@ -320,6 +312,7 @@ setup( ext_modules = _ext_modules, fullname = "Deluge Bittorent Client", include_package_data = True, + language = "c++", license = "GPLv3", name = "deluge", package_data = {"deluge": ["ui/gtkui/glade/*.glade",