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