Mercurial Repositories > eric / file diff

--- a/Preferences/ProgramsDialog.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Preferences/ProgramsDialog.py	Sat Jan 02 15:11:35 2010 +0000
@@ -17,7 +17,7 @@
 
 from E4Gui.E4Application import e4App
 
-from Ui_ProgramsDialog import Ui_ProgramsDialog
+from .Ui_ProgramsDialog import Ui_ProgramsDialog
 
 import Preferences
 import Utilities
@@ -234,7 +234,7 @@
                     finished = proc.waitForFinished(10000)
                     if finished:
                         output = \
-                            unicode(proc.readAllStandardOutput(), 
+                            str(proc.readAllStandardOutput(), 
                                     Preferences.getSystem("IOEncoding"), 
                                     'replace')
                         if versionRe is None: