diff --git a/deluge/metafile.py b/deluge/metafile.py index 32fd9a79c..d2477d230 100644 --- a/deluge/metafile.py +++ b/deluge/metafile.py @@ -1,20 +1,15 @@ -# Taken from http://download.bittorrent.com/dl/BitTorrent-5.3-GPL.tar.gz +# -*- coding: utf-8 -*- # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# Original file from BitTorrent-5.3-GPL.tar.gz +# Copyright (C) Bram Cohen # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# Modifications for use in Deluge: +# Copyright (C) 2007 Andrew Resch +# +# This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with +# the additional special exception to link portions of this program with the OpenSSL library. +# See LICENSE for more details. # -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Written by Bram Cohen -# Modifications for use in Deluge by Andrew Resch 2008 import logging import os.path diff --git a/deluge/plugins/Execute/setup.py b/deluge/plugins/Execute/setup.py index 9b5261c1f..efd8a2d29 100644 --- a/deluge/plugins/Execute/setup.py +++ b/deluge/plugins/Execute/setup.py @@ -1,34 +1,10 @@ -# -# setup.py +# -*- coding: utf-8 -*- # # Copyright (C) 2009 Damien Churchill # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, write to: -# The Free Software Foundation, Inc., -# 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. -# +# This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with +# the additional special exception to link portions of this program with the OpenSSL library. +# See LICENSE for more details. # from setuptools import find_packages, setup diff --git a/deluge/plugins/Extractor/deluge/plugins/extractor/webui.py b/deluge/plugins/Extractor/deluge/plugins/extractor/webui.py index a55491981..bacb89113 100644 --- a/deluge/plugins/Extractor/deluge/plugins/extractor/webui.py +++ b/deluge/plugins/Extractor/deluge/plugins/extractor/webui.py @@ -13,9 +13,10 @@ import logging -from .common import get_resource from deluge.plugins.pluginbase import WebPluginBase +from .common import get_resource + log = logging.getLogger(__name__) diff --git a/deluge/plugins/Label/setup.py b/deluge/plugins/Label/setup.py index 9e3eb0b30..7b8f2d9dd 100644 --- a/deluge/plugins/Label/setup.py +++ b/deluge/plugins/Label/setup.py @@ -1,35 +1,11 @@ -# setup.py +# -*- coding: utf-8 -*- # # Copyright (C) 2008 Martijn Voncken # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. +# This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with +# the additional special exception to link portions of this program with the OpenSSL library. +# See LICENSE for more details. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, write to: -# The Free Software Foundation, Inc., -# 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 find_packages, setup diff --git a/deluge/scripts/create_plugin.py b/deluge/scripts/create_plugin.py index 2fc224c38..fb5f5304c 100644 --- a/deluge/scripts/create_plugin.py +++ b/deluge/scripts/create_plugin.py @@ -320,31 +320,10 @@ Script: %(filename)s Copyright: (C) %(author_name)s %(current_year)s <%(author_email)s> - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, write to: - The Free Software Foundation, Inc., - 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. + This file is part of %(name)s and is licensed under GNU General Public License 3.0, or later, with + the additional special exception to link portions of this program with the OpenSSL library. + See LICENSE for more details. */ %(name)sPlugin = Ext.extend(Deluge.Plugin, { @@ -377,7 +356,7 @@ GPL = """# # Copyright (C) 2009 Damien Churchill # Copyright (C) 2010 Pedro Algarvio # -# This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with +# This file is part of %(name)s and is licensed under GNU General Public License 3.0, or later, with # the additional special exception to link portions of this program with the OpenSSL library. # See LICENSE for more details. # diff --git a/gen_web_gettext.py b/gen_web_gettext.py index 49730dba5..9b6126492 100755 --- a/gen_web_gettext.py +++ b/gen_web_gettext.py @@ -1,7 +1,15 @@ -#!/usr/bin/python -""" -Script to go through the javascript files and dynamically generate gettext.js -""" +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# Copyright (C) 2009-2012 Damien Churchill +# +# This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with +# the additional special exception to link portions of this program with the OpenSSL library. +# See LICENSE for more details. +# + +"""Script to parse javascript files for translation strings and generate gettext.js""" + import os import re diff --git a/generate_pot.py b/generate_pot.py index 3fb5b25a0..5d3b24c62 100755 --- a/generate_pot.py +++ b/generate_pot.py @@ -1,7 +1,16 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # -# This script creates the deluge.pot template file for translators +# Copyright (C) 2011-2013 Calum Lind +# Copyright (C) 2009 Andrew Resch # +# This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with +# the additional special exception to link portions of this program with the OpenSSL library. +# See LICENSE for more details. +# + +"""Parses Python and Javascript code for translation strings to create the 'deluge.pot' template for translators""" + import os import re from datetime import datetime diff --git a/minify_web_js.py b/minify_web_js.py index 23b8fbb6a..9388b52e1 100755 --- a/minify_web_js.py +++ b/minify_web_js.py @@ -1,4 +1,14 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# Copyright (C) 2014 Calum Lind +# Copyright (C) 2010 Damien Churchill +# +# This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with +# the additional special exception to link portions of this program with the OpenSSL library. +# See LICENSE for more details. +# + import fileinput import fnmatch import os diff --git a/msgfmt.py b/msgfmt.py index 651af3aad..fc8df05e5 100755 --- a/msgfmt.py +++ b/msgfmt.py @@ -26,11 +26,11 @@ Options: Display version information and exit. """ -import sys -import os -import getopt -import struct import array +import getopt +import os +import struct +import sys __version__ = "1.1" diff --git a/setup.py b/setup.py index 91e89aa2b..1c5f5cda8 100755 --- a/setup.py +++ b/setup.py @@ -1,25 +1,12 @@ #!/usr/bin/env python -# -# setup.py +# -*- coding: utf-8 -*- # # Copyright (C) 2007 Andrew Resch -# 2009 Damien Churchill +# Copyright (C) 2009 Damien Churchill # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, write to: -# The Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor -# Boston, MA 02110-1301, USA. +# This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with +# the additional special exception to link portions of this program with the OpenSSL library. +# See LICENSE for more details. # import glob