gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-01-08 06:44:20 +01:00
Code Issues Projects Releases Wiki Activity

fixing more Python version issues

Browse Source
This commit is contained in:
Adam Blackburn
2010-12-23 09:12:58 -10:00
parent 0e9eac0a89
commit e3f16e237d
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
NEWS
View File

@@ -1,5 +1,13 @@
Wicd 1.7.0 Branch Wicd 1.7.0 Branch
1.7.1b2: 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: Minor Changes:
- Now uses gtkbuilder instead of libglade - Now uses gtkbuilder instead of libglade
- Fixed bug in script macro expansion - Fixed bug in script macro expansion
@@ -7,7 +15,8 @@ Wicd 1.7.0 Branch
- Applied 1 patch from Archlinux (thanks Rémy Oudompheng) - Applied 1 patch from Archlinux (thanks Rémy Oudompheng)
- Fixed Python 2.7 support - Fixed Python 2.7 support
- Works if Python3 is the default Python - 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 - Includes translations in source tarball
- Improved documentation - Improved documentation
- Fixed resolv.conf permissions - Fixed resolv.conf permissions

2
wicd/autoconnect.py
View File

@@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/env python
""" autoconnect -- Triggers an automatic connection attempt. """ """ autoconnect -- Triggers an automatic connection attempt. """

2
wicd/logfile.py
View File

@@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/env python
# #
# Copyright (C) 1999-2006 Keith Dart <keith@kdart.com> # Copyright (C) 1999-2006 Keith Dart <keith@kdart.com>

2
wicd/suspend.py
View File

@@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/env python
""" Suspends the wicd daemon. """ Suspends the wicd daemon.

2
wicd/wicd-daemon.py
View File

@@ -1806,7 +1806,7 @@ def main(argv):
wicd_bus = dbus.service.BusName('org.wicd.daemon', bus=bus) wicd_bus = dbus.service.BusName('org.wicd.daemon', bus=bus)
daemon = WicdDaemon(wicd_bus, auto_connect=auto_connect) daemon = WicdDaemon(wicd_bus, auto_connect=auto_connect)
if not no_poll: 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")], os.path.join(wpath.daemon, "monitor.py")],
shell=False, close_fds=True).pid shell=False, close_fds=True).pid
atexit.register(on_exit, child_pid) atexit.register(on_exit, child_pid)