From e3f16e237d2af85a0133391941b6bf0c35a6be77 Mon Sep 17 00:00:00 2001 From: Adam Blackburn Date: Thu, 23 Dec 2010 09:12:58 -1000 Subject: [PATCH] fixing more Python version issues --- NEWS | 11 ++++++++++- wicd/autoconnect.py | 2 +- wicd/logfile.py | 2 +- wicd/suspend.py | 2 +- wicd/wicd-daemon.py | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 8f2bf71..68e2913 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,13 @@ Wicd 1.7.0 Branch 1.7.1b2: + Changes for Packagers: + - You will now want to use the --python option to setup.py configure to + make sure the right Python (python2.x) is used. With the Python 3 + transition in progress, the lack of uniformity across distros made it + difficult to find a solution that works everywhere. As a result, the + python executable path can be set (for subprocesses launched by Wicd) + with the --python option to setup.py configure, and patching of the + shebang lines may be required if `which python` is not python2.x. Minor Changes: - Now uses gtkbuilder instead of libglade - Fixed bug in script macro expansion @@ -7,7 +15,8 @@ Wicd 1.7.0 Branch - Applied 1 patch from Archlinux (thanks Rémy Oudompheng) - Fixed Python 2.7 support - Works if Python3 is the default Python - - Applied 14 patches from Debian (big thank you to everyone who contributed): + - Applied 14 patches from Debian (big thank you to everyone + who contributed): - Includes translations in source tarball - Improved documentation - Fixed resolv.conf permissions diff --git a/wicd/autoconnect.py b/wicd/autoconnect.py index b68a5c7..8d9550c 100755 --- a/wicd/autoconnect.py +++ b/wicd/autoconnect.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python """ autoconnect -- Triggers an automatic connection attempt. """ diff --git a/wicd/logfile.py b/wicd/logfile.py index 639a912..734b11e 100644 --- a/wicd/logfile.py +++ b/wicd/logfile.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # Copyright (C) 1999-2006 Keith Dart diff --git a/wicd/suspend.py b/wicd/suspend.py index e60f5c6..db19ac1 100755 --- a/wicd/suspend.py +++ b/wicd/suspend.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python """ Suspends the wicd daemon. diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py index 7983926..6d8b149 100644 --- a/wicd/wicd-daemon.py +++ b/wicd/wicd-daemon.py @@ -1806,7 +1806,7 @@ def main(argv): wicd_bus = dbus.service.BusName('org.wicd.daemon', bus=bus) daemon = WicdDaemon(wicd_bus, auto_connect=auto_connect) if not no_poll: - child_pid = Popen([misc.find_path("python2"), "-O", + child_pid = Popen([wpath.python, "-O", os.path.join(wpath.daemon, "monitor.py")], shell=False, close_fds=True).pid atexit.register(on_exit, child_pid)