From da37f398fa30c62e961916e5b196a791840ac35b Mon Sep 17 00:00:00 2001 From: Stephen Boddy Date: Fri, 25 Nov 2016 02:29:55 +0100 Subject: [PATCH] Fix terminator not working with default python3 by forcing python2 --- remotinator | 2 +- setup.py | 2 +- terminator | 2 +- terminatorlib/__init__.py | 2 +- terminatorlib/borg.py | 2 +- terminatorlib/config.py | 2 +- terminatorlib/container.py | 2 +- terminatorlib/cwd.py | 2 +- terminatorlib/debugserver.py | 2 +- terminatorlib/editablelabel.py | 2 +- terminatorlib/encoding.py | 2 +- terminatorlib/factory.py | 2 +- terminatorlib/freebsd.py | 2 +- terminatorlib/ipc.py | 2 +- terminatorlib/keybindings.py | 2 +- terminatorlib/layoutlauncher.py | 2 +- terminatorlib/notebook.py | 2 +- terminatorlib/optionparse.py | 2 +- terminatorlib/paned.py | 2 +- terminatorlib/plugin.py | 2 +- terminatorlib/plugins/activitywatch.py | 2 +- terminatorlib/plugins/custom_commands.py | 2 +- terminatorlib/plugins/logger.py | 2 +- terminatorlib/plugins/maven.py | 1 + terminatorlib/plugins/terminalshot.py | 2 +- terminatorlib/plugins/testplugin.py | 1 + terminatorlib/plugins/url_handlers.py | 1 + terminatorlib/prefseditor.py | 2 +- terminatorlib/searchbar.py | 2 +- terminatorlib/signalman.py | 2 +- terminatorlib/terminal.py | 2 +- terminatorlib/terminal_popup_menu.py | 2 +- terminatorlib/terminator.py | 2 +- terminatorlib/titlebar.py | 2 +- terminatorlib/translation.py | 2 +- terminatorlib/util.py | 2 +- terminatorlib/version.py | 2 +- terminatorlib/window.py | 7 +++++-- tests/test_doctests.py | 1 + tests/testborg.py | 2 +- tests/testsignalman.py | 2 +- 41 files changed, 45 insertions(+), 38 deletions(-) diff --git a/remotinator b/remotinator index 8e2b884c..60f779ac 100755 --- a/remotinator +++ b/remotinator @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # remotinator - send commands to Terminator via DBus # Copyright (C) 2006-2010 cmsj@tenshu.net # diff --git a/setup.py b/setup.py index 6e4b2161..12bbfeca 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 from distutils.core import setup from distutils.dist import Distribution diff --git a/terminator b/terminator index 0458af39..f46345f5 100755 --- a/terminator +++ b/terminator @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Terminator - multiple gnome terminals in one window # Copyright (C) 2006-2010 cmsj@tenshu.net # diff --git a/terminatorlib/__init__.py b/terminatorlib/__init__.py index 314dc331..af78cae8 100644 --- a/terminatorlib/__init__.py +++ b/terminatorlib/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator - multiple gnome terminals in one window # Copyright (C) 2006-2010 cmsj@tenshu.net # diff --git a/terminatorlib/borg.py b/terminatorlib/borg.py index 729e4d2c..38ac7738 100755 --- a/terminatorlib/borg.py +++ b/terminatorlib/borg.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """borg.py - We are the borg. Resistance is futile. diff --git a/terminatorlib/config.py b/terminatorlib/config.py index 1d42cd2c..813c56b3 100755 --- a/terminatorlib/config.py +++ b/terminatorlib/config.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # TerminatorConfig - layered config classes # Copyright (C) 2006-2010 cmsj@tenshu.net # diff --git a/terminatorlib/container.py b/terminatorlib/container.py index 9a59e414..d7155dfa 100755 --- a/terminatorlib/container.py +++ b/terminatorlib/container.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """container.py - classes necessary to contain Terminal widgets""" diff --git a/terminatorlib/cwd.py b/terminatorlib/cwd.py index 8cb6c197..98bd9881 100755 --- a/terminatorlib/cwd.py +++ b/terminatorlib/cwd.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """cwd.py - function necessary to get the cwd for a given pid on various OSes diff --git a/terminatorlib/debugserver.py b/terminatorlib/debugserver.py index 2621331a..ef57b8e7 100644 --- a/terminatorlib/debugserver.py +++ b/terminatorlib/debugserver.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # # Copyright (c) 2008, Thomas Hurst # diff --git a/terminatorlib/editablelabel.py b/terminatorlib/editablelabel.py index 7091e0aa..6a391671 100644 --- a/terminatorlib/editablelabel.py +++ b/terminatorlib/editablelabel.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab # # Copyright (c) 2009, Emmanuel Bretelle diff --git a/terminatorlib/encoding.py b/terminatorlib/encoding.py index b0a5ec20..a4d274bf 100644 --- a/terminatorlib/encoding.py +++ b/terminatorlib/encoding.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # TerminatorEncoding - charset encoding classes # Copyright (C) 2006-2010 chantra@debuntu.org # diff --git a/terminatorlib/factory.py b/terminatorlib/factory.py index 2ecaa2f7..7ef05fb5 100755 --- a/terminatorlib/factory.py +++ b/terminatorlib/factory.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """factory.py - Maker of objects diff --git a/terminatorlib/freebsd.py b/terminatorlib/freebsd.py index 5157172f..e19f008e 100644 --- a/terminatorlib/freebsd.py +++ b/terminatorlib/freebsd.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # # Copyright (c) 2008, Thomas Hurst # diff --git a/terminatorlib/ipc.py b/terminatorlib/ipc.py index 43971de3..98940890 100644 --- a/terminatorlib/ipc.py +++ b/terminatorlib/ipc.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """ipc.py - DBus server and API calls""" diff --git a/terminatorlib/keybindings.py b/terminatorlib/keybindings.py index 0e8676fc..47606250 100644 --- a/terminatorlib/keybindings.py +++ b/terminatorlib/keybindings.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator - multiple gnome terminals in one window # Copyright (C) 2006-2010 cmsj@tenshu.net # diff --git a/terminatorlib/layoutlauncher.py b/terminatorlib/layoutlauncher.py index a1ddbd49..7697f77f 100755 --- a/terminatorlib/layoutlauncher.py +++ b/terminatorlib/layoutlauncher.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """layoutlauncher.py - class for the Layout Launcher window""" diff --git a/terminatorlib/notebook.py b/terminatorlib/notebook.py index 1b65b500..651e6611 100755 --- a/terminatorlib/notebook.py +++ b/terminatorlib/notebook.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """notebook.py - classes for the notebook widget""" diff --git a/terminatorlib/optionparse.py b/terminatorlib/optionparse.py index f22e4207..22b49747 100755 --- a/terminatorlib/optionparse.py +++ b/terminatorlib/optionparse.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator.optionparse - Parse commandline options # Copyright (C) 2006-2010 cmsj@tenshu.net # diff --git a/terminatorlib/paned.py b/terminatorlib/paned.py index 394f0336..90903392 100755 --- a/terminatorlib/paned.py +++ b/terminatorlib/paned.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """paned.py - a base Paned container class and the vertical/horizontal diff --git a/terminatorlib/plugin.py b/terminatorlib/plugin.py index 33f69623..208081b6 100755 --- a/terminatorlib/plugin.py +++ b/terminatorlib/plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """plugin.py - Base plugin system diff --git a/terminatorlib/plugins/activitywatch.py b/terminatorlib/plugins/activitywatch.py index 6d75d10f..de474a08 100755 --- a/terminatorlib/plugins/activitywatch.py +++ b/terminatorlib/plugins/activitywatch.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """activitywatch.py - Terminator Plugin to watch a terminal for activity""" diff --git a/terminatorlib/plugins/custom_commands.py b/terminatorlib/plugins/custom_commands.py index ee64625a..6ded9bcc 100755 --- a/terminatorlib/plugins/custom_commands.py +++ b/terminatorlib/plugins/custom_commands.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """custom_commands.py - Terminator Plugin to add custom command menu entries""" diff --git a/terminatorlib/plugins/logger.py b/terminatorlib/plugins/logger.py index 0c4b1532..25cb3c50 100644 --- a/terminatorlib/plugins/logger.py +++ b/terminatorlib/plugins/logger.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Plugin by Sinan Nalkaya # See LICENSE of Terminator package. diff --git a/terminatorlib/plugins/maven.py b/terminatorlib/plugins/maven.py index 0a631020..134f61fa 100755 --- a/terminatorlib/plugins/maven.py +++ b/terminatorlib/plugins/maven.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 # Copyright (c) 2010 Julien Nicoulaud # # This program is free software; you can redistribute it and/or modify diff --git a/terminatorlib/plugins/terminalshot.py b/terminatorlib/plugins/terminalshot.py index 9a4fbafe..8974ef86 100755 --- a/terminatorlib/plugins/terminalshot.py +++ b/terminatorlib/plugins/terminalshot.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """terminalshot.py - Terminator Plugin to take 'screenshots' of individual diff --git a/terminatorlib/plugins/testplugin.py b/terminatorlib/plugins/testplugin.py index e18ed60c..660313ac 100644 --- a/terminatorlib/plugins/testplugin.py +++ b/terminatorlib/plugins/testplugin.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 import terminatorlib.plugin as plugin # AVAILABLE must contain a list of all the classes that you want exposed diff --git a/terminatorlib/plugins/url_handlers.py b/terminatorlib/plugins/url_handlers.py index 436406e0..e9f3320b 100644 --- a/terminatorlib/plugins/url_handlers.py +++ b/terminatorlib/plugins/url_handlers.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """searchbar.py - classes necessary to provide a terminal search bar""" diff --git a/terminatorlib/signalman.py b/terminatorlib/signalman.py index 1b5ac2c4..b52b8e65 100755 --- a/terminatorlib/signalman.py +++ b/terminatorlib/signalman.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """Simple management of Gtk Widget signal handlers""" diff --git a/terminatorlib/terminal.py b/terminatorlib/terminal.py index 6c3bad7d..b02a9da6 100755 --- a/terminatorlib/terminal.py +++ b/terminatorlib/terminal.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """terminal.py - classes necessary to provide Terminal widgets""" diff --git a/terminatorlib/terminal_popup_menu.py b/terminatorlib/terminal_popup_menu.py index 4b7d91cd..4f159320 100755 --- a/terminatorlib/terminal_popup_menu.py +++ b/terminatorlib/terminal_popup_menu.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """terminal_popup_menu.py - classes necessary to provide a terminal context diff --git a/terminatorlib/terminator.py b/terminatorlib/terminator.py index 97f6f3f9..6f73aec2 100755 --- a/terminatorlib/terminator.py +++ b/terminatorlib/terminator.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """terminator.py - class for the master Terminator singleton""" diff --git a/terminatorlib/titlebar.py b/terminatorlib/titlebar.py index dd672c66..5d1e79b2 100755 --- a/terminatorlib/titlebar.py +++ b/terminatorlib/titlebar.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """titlebar.py - classes necessary to provide a terminal title bar""" diff --git a/terminatorlib/translation.py b/terminatorlib/translation.py index ff8bafef..a392c3ed 100644 --- a/terminatorlib/translation.py +++ b/terminatorlib/translation.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator - multiple gnome terminals in one window # Copyright (C) 2006-2010 cmsj@tenshu.net # diff --git a/terminatorlib/util.py b/terminatorlib/util.py index 70395538..b1199acc 100755 --- a/terminatorlib/util.py +++ b/terminatorlib/util.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator.util - misc utility functions # Copyright (C) 2006-2010 cmsj@tenshu.net # diff --git a/terminatorlib/version.py b/terminatorlib/version.py index 93d82935..23906d02 100644 --- a/terminatorlib/version.py +++ b/terminatorlib/version.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # TerminatorVersion - version number # Copyright (C) 2010 cmsj@tenshu.net # diff --git a/terminatorlib/window.py b/terminatorlib/window.py index 52c113dc..038972bb 100755 --- a/terminatorlib/window.py +++ b/terminatorlib/window.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """window.py - class for the main Terminator window""" @@ -8,7 +8,7 @@ import time import uuid import gi from gi.repository import GObject -from gi.repository import Gtk, Gdk +from gi.repository import Gtk, Gdk, GdkX11 from util import dbg, err, make_uuid, display_manager import util @@ -308,6 +308,9 @@ class Window(Container, Gtk.Window): t = GdkX11.x11_get_server_time(self.window) except AttributeError: t = 0 + print t + print self + print self.window self.window.focus(t) else: self.position = self.get_position() diff --git a/tests/test_doctests.py b/tests/test_doctests.py index 6ca0d210..1948bf5a 100644 --- a/tests/test_doctests.py +++ b/tests/test_doctests.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 """Load up the tests.""" import os diff --git a/tests/testborg.py b/tests/testborg.py index 38794019..4d77172d 100755 --- a/tests/testborg.py +++ b/tests/testborg.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """testborg.py - We are the borg. Resistance is futile. diff --git a/tests/testsignalman.py b/tests/testsignalman.py index 410c5f83..56f3c5d9 100755 --- a/tests/testsignalman.py +++ b/tests/testsignalman.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Terminator by Chris Jones # GPL v2 only """testsignalman.py - Test the signalman class