Fix shebang and executable flag for all scripts

remotinator

@@ -1,4 +1,5 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
+#
 #    remotinator - send commands to Terminator via DBus
 #    Copyright (C) 2006-2010  cmsj@tenshu.net
 #

terminator

@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+#
 #    Terminator - multiple gnome terminals in one window
 #    Copyright (C) 2006-2010  cmsj@tenshu.net
 #

terminatorlib/__init__.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python2
-#    Terminator - multiple gnome terminals in one window
-#    Copyright (C) 2006-2010  cmsj@tenshu.net
+# Terminator - multiple gnome terminals in one window
+# Copyright (C) 2006-2010  cmsj@tenshu.net
 #
 # 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

terminatorlib/borg.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """borg.py - We are the borg. Resistance is futile.

terminatorlib/config.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python2
-#    TerminatorConfig - layered config classes
-#    Copyright (C) 2006-2010  cmsj@tenshu.net
+#  TerminatorConfig - layered config classes
+#  Copyright (C) 2006-2010  cmsj@tenshu.net
 #
 #  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

terminatorlib/container.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """container.py - classes necessary to contain Terminal widgets"""

terminatorlib/cwd.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """cwd.py - function necessary to get the cwd for a given pid on various OSes

terminatorlib/debugserver.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python2
-#
 # Copyright (c) 2008, Thomas Hurst <tom@hur.st>
 #
 # Use of this file is unrestricted provided this notice is retained.

terminatorlib/editablelabel.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab
 #
 # Copyright (c) 2009, Emmanuel Bretelle <chantra@debuntu.org>

terminatorlib/encoding.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python2
-#    TerminatorEncoding - charset encoding classes
-#    Copyright (C) 2006-2010  chantra@debuntu.org
+#  TerminatorEncoding - charset encoding classes
+#  Copyright (C) 2006-2010  chantra@debuntu.org
 #
 #  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

terminatorlib/factory.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """factory.py - Maker of objects

terminatorlib/freebsd.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 #
 # Copyright (c) 2008, Thomas Hurst <tom@hur.st>
 #

terminatorlib/ipc.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """ipc.py - DBus server and API calls"""

terminatorlib/keybindings.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python2
-#  Terminator - multiple gnome terminals in one window
-#   Copyright (C) 2006-2010  cmsj@tenshu.net
+# Terminator - multiple gnome terminals in one window
+# Copyright (C) 2006-2010  cmsj@tenshu.net
 #
 # 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

terminatorlib/layoutlauncher.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """layoutlauncher.py - class for the Layout Launcher window"""

terminatorlib/notebook.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """notebook.py - classes for the notebook widget"""

terminatorlib/optionparse.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python2
-#    Terminator.optionparse - Parse commandline options
-#    Copyright (C) 2006-2010  cmsj@tenshu.net
+#  Terminator.optionparse - Parse commandline options
+#  Copyright (C) 2006-2010  cmsj@tenshu.net
 #
 #  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

terminatorlib/paned.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """paned.py - a base Paned container class and the vertical/horizontal

terminatorlib/plugin.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """plugin.py - Base plugin system

terminatorlib/plugins/activitywatch.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """activitywatch.py - Terminator Plugin to watch a terminal for activity"""

terminatorlib/plugins/custom_commands.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """custom_commands.py - Terminator Plugin to add custom command menu entries"""

terminatorlib/plugins/logger.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python2
-
 # Plugin by Sinan Nalkaya <sardok@gmail.com>
 # See LICENSE of Terminator package.
 

terminatorlib/plugins/maven.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Copyright (c) 2010 Julien Nicoulaud <julien.nicoulaud@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -14,6 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor
 # , Boston, MA  02110-1301  USA
+
 import re
 import terminatorlib.plugin as plugin
 

terminatorlib/plugins/terminalshot.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """terminalshot.py - Terminator Plugin to take 'screenshots' of individual

terminatorlib/plugins/testplugin.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 import terminatorlib.plugin as plugin
 
 # AVAILABLE must contain a list of all the classes that you want exposed

terminatorlib/plugins/url_handlers.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net?
 # GPL v2 only
 """url_handlers.py - Default plugins for URL handling"""

terminatorlib/prefseditor.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 """Preferences Editor for Terminator. 
 
 Load a UIBuilder config file, display it,

terminatorlib/searchbar.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """searchbar.py - classes necessary to provide a terminal search bar"""

terminatorlib/signalman.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """Simple management of Gtk Widget signal handlers"""

terminatorlib/terminal.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """terminal.py - classes necessary to provide Terminal widgets"""

terminatorlib/terminal_popup_menu.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """terminal_popup_menu.py - classes necessary to provide a terminal context 

terminatorlib/terminator.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """terminator.py - class for the master Terminator singleton"""

terminatorlib/titlebar.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """titlebar.py - classes necessary to provide a terminal title bar"""

terminatorlib/translation.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python2
-#    Terminator - multiple gnome terminals in one window
-#    Copyright (C) 2006-2010  cmsj@tenshu.net
+# Terminator - multiple gnome terminals in one window
+# Copyright (C) 2006-2010  cmsj@tenshu.net
 #
 # 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

terminatorlib/util.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python2
-#    Terminator.util - misc utility functions
-#    Copyright (C) 2006-2010  cmsj@tenshu.net
+# Terminator.util - misc utility functions
+# Copyright (C) 2006-2010  cmsj@tenshu.net
 #
 #  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

terminatorlib/version.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python2
-#    TerminatorVersion - version number
-#    Copyright (C) 2010  cmsj@tenshu.net
+#  TerminatorVersion - version number
+#  Copyright (C) 2010  cmsj@tenshu.net
 #
 #  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

terminatorlib/window.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """window.py - class for the main Terminator window"""

tests/test_doctests.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 """Load up the tests."""
 
 import os

tests/testborg.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """testborg.py - We are the borg. Resistance is futile.
@@ -57,3 +57,4 @@ class TestBorg2(Borg):
         if not self.attribute:
             self.attribute = 1
 
+# TODO: implement test?

tests/testsignalman.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # Terminator by Chris Jones <cmsj@tenshu.net>
 # GPL v2 only
 """testsignalman.py - Test the signalman class