Update headers and isort imports

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
+# Original file from BitTorrent-5.3-GPL.tar.gz
-# it under the terms of the GNU General Public License as published by
+# Copyright (C) Bram Cohen
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# Modifications for use in Deluge:
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com>
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#
-# GNU General Public License for more details.
+# 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 <http://www.gnu.org/licenses/>.
-
-# Written by Bram Cohen
-# Modifications for use in Deluge by Andrew Resch 2008
 
 import logging
 import os.path

deluge/plugins/Execute/setup.py

@@ -1,34 +1,10 @@
-#
+# -*- coding: utf-8 -*-
-# setup.py
 #
 # Copyright (C) 2009 Damien Churchill <damoxc@gmail.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with
-# it under the terms of the GNU General Public License as published by
+# the additional special exception to link portions of this program with the OpenSSL library.
-# the Free Software Foundation; either version 3, or (at your option)
+# See LICENSE for more details.
-# 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.
-#
 #
 
 from setuptools import find_packages, setup

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__)
 
 

deluge/plugins/Label/setup.py

@@ -1,35 +1,11 @@
-# setup.py
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with
-# it under the terms of the GNU General Public License as published by
+# the additional special exception to link portions of this program with the OpenSSL library.
-# the Free Software Foundation; either version 3, or (at your option)
+# See LICENSE for more details.
-# 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.
-#
-#
-
 
 from setuptools import find_packages, setup
 

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,
+    This file is part of %(name)s and is licensed under GNU General Public License 3.0, or later, with
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    the additional special exception to link portions of this program with the OpenSSL library.
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    See LICENSE for more details.
-    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.
 */
 
 %(name)sPlugin = Ext.extend(Deluge.Plugin, {
@@ -377,7 +356,7 @@ GPL = """#
 # Copyright (C) 2009 Damien Churchill <damoxc@gmail.com>
 # Copyright (C) 2010 Pedro Algarvio <pedro@algarvio.me>
 #
-# 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.
 #

gen_web_gettext.py

@@ -1,7 +1,15 @@
-#!/usr/bin/python
+#!/usr/bin/env python
-"""
+# -*- coding: utf-8 -*-
-Script to go through the javascript files and dynamically generate gettext.js
+#
-"""
+# Copyright (C) 2009-2012 Damien Churchill <damoxc@gmail.com>
+#
+# 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
 

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 <calumlind@gmail.com>
+# Copyright (C) 2009 Andrew Resch <andrewresch@gmail.com>
 #
+# 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

minify_web_js.py

@@ -1,4 +1,14 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2014 Calum Lind <calumlind@gmail.com>
+# Copyright (C) 2010 Damien Churchill <damoxc@gmail.com>
+#
+# 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

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"
 

setup.py

@@ -1,25 +1,12 @@
 #!/usr/bin/env python
-#
+# -*- coding: utf-8 -*-
-# setup.py
 #
 # Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com>
-#               2009 Damien Churchill <damoxc@gmail.com>
+# Copyright (C) 2009 Damien Churchill <damoxc@gmail.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with
-# it under the terms of the GNU General Public License as published by
+# the additional special exception to link portions of this program with the OpenSSL library.
-# the Free Software Foundation; either version 3, or (at your option)
+# See LICENSE for more details.
-# 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.
 #
 
 import glob