17153
|
1 |
diff -u gDesklets-0.36.1.old/ctrlinfo gDesklets-0.36.1/ctrlinfo
|
|
2 |
--- gDesklets-0.36.1.old/ctrlinfo 2009-12-09 14:48:14.041042000 +0800
|
|
3 |
+++ gDesklets-0.36.1/ctrlinfo 2009-12-09 14:54:08.396962000 +0800
|
|
4 |
@@ -1,4 +1,4 @@
|
|
5 |
-#! /usr/bin/env python
|
|
6 |
+#! /usr/bin/env python2.6
|
|
7 |
|
|
8 |
# This tool loads a given control and outputs information about the control.
|
|
9 |
#
|
|
10 |
diff -u gDesklets-0.36.1.old/gdesklets gDesklets-0.36.1/gdesklets
|
|
11 |
--- gDesklets-0.36.1.old/gdesklets 2009-12-09 14:48:14.041210000 +0800
|
|
12 |
+++ gDesklets-0.36.1/gdesklets 2009-12-09 14:54:20.452467000 +0800
|
|
13 |
@@ -1,4 +1,4 @@
|
|
14 |
-#! /usr/bin/env python
|
|
15 |
+#! /usr/bin/env python2.6
|
|
16 |
|
|
17 |
from main import client, DISPLAY, HOME, USERHOME
|
|
18 |
from main import LOGFILE, LOG_PATH, PID_PATH, REGISTRY_PATH, SOCKET_PATH
|
|
19 |
diff -u gDesklets-0.36.1.old/gdesklets-daemon gDesklets-0.36.1/gdesklets-daemon
|
|
20 |
--- gDesklets-0.36.1.old/gdesklets-daemon 2009-12-09 14:48:14.041345000 +0800
|
|
21 |
+++ gDesklets-0.36.1/gdesklets-daemon 2009-12-09 14:54:42.524281000 +0800
|
|
22 |
@@ -1,4 +1,4 @@
|
|
23 |
-#! /usr/bin/env python
|
|
24 |
+#! /usr/bin/env python2.6
|
|
25 |
# -*- coding: UTF-8 -*-
|
|
26 |
|
|
27 |
import __builtin__
|
|
28 |
diff -u gDesklets-0.36.1.old/gdesklets-logview gDesklets-0.36.1/gdesklets-logview
|
|
29 |
--- gDesklets-0.36.1.old/gdesklets-logview 2009-12-09 14:48:14.041477000 +0800
|
|
30 |
+++ gDesklets-0.36.1/gdesklets-logview 2009-12-09 14:54:53.596152000 +0800
|
|
31 |
@@ -1,4 +1,4 @@
|
|
32 |
-#! /usr/bin/env python
|
|
33 |
+#! /usr/bin/env python2.6
|
|
34 |
|
|
35 |
#
|
|
36 |
# Log file viewer for gDesklets.
|
|
37 |
diff -u gDesklets-0.36.1.old/gdesklets-migration-tool gDesklets-0.36.1/gdesklets-migration-tool
|
|
38 |
--- gDesklets-0.36.1.old/gdesklets-migration-tool 2009-12-09 14:48:14.041612000 +0800
|
|
39 |
+++ gDesklets-0.36.1/gdesklets-migration-tool 2009-12-09 14:55:13.364014000 +0800
|
|
40 |
@@ -1,4 +1,4 @@
|
|
41 |
-#!/usr/bin/env python
|
|
42 |
+#!/usr/bin/env python2.6
|
|
43 |
#
|
|
44 |
# TODO:
|
|
45 |
# -Add selectors for previous and current gDesklets versions
|
|
46 |
diff -u gDesklets-0.36.1.old/gdesklets-shell gDesklets-0.36.1/gdesklets-shell
|
|
47 |
--- gDesklets-0.36.1.old/gdesklets-shell 2009-12-09 14:48:14.041739000 +0800
|
|
48 |
+++ gDesklets-0.36.1/gdesklets-shell 2009-12-09 14:55:25.715918000 +0800
|
|
49 |
@@ -1,4 +1,4 @@
|
|
50 |
-#! /usr/bin/env python
|
|
51 |
+#! /usr/bin/env python2.6
|
|
52 |
|
|
53 |
from utils import i18n
|
|
54 |
import __builtin__
|
|
55 |
diff -u gDesklets-0.36.1.old/test-control.py gDesklets-0.36.1/test-control.py
|
|
56 |
--- gDesklets-0.36.1.old/test-control.py 2009-12-09 14:48:14.053620000 +0800
|
|
57 |
+++ gDesklets-0.36.1/test-control.py 2009-12-09 14:55:50.883623000 +0800
|
|
58 |
@@ -1,4 +1,4 @@
|
|
59 |
-#! /usr/bin/env python
|
|
60 |
+#! /usr/bin/env python2.6
|
|
61 |
# A simple script to test controls interactively.
|
|
62 |
|
|
63 |
from plugin.Interface import Interface
|
|
64 |
--- gDesklets-0.36.1.old/utils/ErrorFormatter.py 2009-12-09 16:27:54.734797000 +0800
|
|
65 |
+++ gDesklets-0.36.1/utils/ErrorFormatter.py 2009-12-09 16:28:42.320703000 +0800
|
|
66 |
@@ -113,9 +113,9 @@
|
|
67 |
# give us an absolute path.
|
|
68 |
#
|
|
69 |
_old_imp = __import__
|
|
70 |
-def _new_imp(name, globs = {}, locls = {}, fromlist = []):
|
|
71 |
+def _new_imp(name, globs = {}, locls = {}, fromlist = [] , level = -1):
|
|
72 |
|
|
73 |
- module = _old_imp(name, globs, locls, fromlist)
|
|
74 |
+ module = _old_imp(name, globs, locls, fromlist, level)
|
|
75 |
# builtin modules have no "__file__" attribute, so we have to check for it
|
|
76 |
if (module):
|
|
77 |
if (hasattr(module, "__file__")):
|