Mercurial Repositories > eric / changeset

--- a/APIs/Python/eric4.api	Fri Jan 01 16:11:36 2010 +0000
+++ b/APIs/Python/eric4.api	Sat Jan 02 15:11:35 2010 +0000
@@ -4599,7 +4599,6 @@
 eric4.QScintilla.SpellChecker.SpellChecker.ignoreAlways?4(word = None)
 eric4.QScintilla.SpellChecker.SpellChecker.initCheck?4(startPos, endPos)
 eric4.QScintilla.SpellChecker.SpellChecker.isAvailable?4()
-eric4.QScintilla.SpellChecker.SpellChecker.next?4()
 eric4.QScintilla.SpellChecker.SpellChecker.remove?4(word)
 eric4.QScintilla.SpellChecker.SpellChecker.replace?4(replacement)
 eric4.QScintilla.SpellChecker.SpellChecker.replaceAlways?4(replacement)

--- a/DataViews/CodeMetrics.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/DataViews/CodeMetrics.py	Sat Jan 02 15:11:35 2010 +0000
@@ -15,12 +15,10 @@
 """
 
 import os
-import cStringIO
+import io
 import keyword
 import token
 import tokenize
-if not hasattr(tokenize, 'NL'):
-    raise ValueError("tokenize.NL doesn't exist -- tokenize module too old")
     
 import Utilities
 
@@ -63,11 +61,23 @@
             
         self.lines = text.count(os.linesep)
         
-        source = cStringIO.StringIO(text)
+        source = io.BytesIO(text.encode("utf-8"))
         try:
-            tokenize.tokenize(source.readline, self.__tokeneater)
-        except tokenize.TokenError, msg:
-            print "Token Error: %s" % str(msg)
+            gen = tokenize.tokenize(source.readline)
+            for toktype, toktext, start, end, line in gen:
+                (srow, scol) = start
+                (erow, ecol) = end
+                if toktype in [token.NEWLINE, tokenize.NL]:
+                    self.__addToken(toktype, os.linesep, srow, scol, line)
+                elif toktype in [token.INDENT, token.DEDENT]:
+                    self.__addToken(toktype, '', srow, scol, line)
+                elif toktype == token.NAME and keyword.iskeyword(toktext):
+                    toktype = KEYWORD
+                    self.__addToken(toktype, toktext, srow, scol, line)
+                else:
+                    self.__addToken(toktype, toktext, srow, scol, line)
+        except tokenize.TokenError as msg:
+            print("Token Error: %s" % str(msg))
             return
         
         return
@@ -84,31 +94,6 @@
         """
         self.tokenlist.append(Token(type=toktype, text=toktext, row=srow, 
                                     col=scol, line=line))
-        
-    def __tokeneater(self, toktype, toktext, (srow, scol), (erow, ecol), line):
-        """
-        Private method called by tokenize.tokenize.
-        
-        @param toktype the type of the token (int)
-        @param toktext the text of the token (string)
-        @param srow starting row of the token (int)
-        @param scol starting column of the token (int)
-        @param erow ending row of the token (int)
-        @param ecol ending column of the token (int)
-        @param line logical line the token was found (string)
-        """
-        if toktype in [token.NEWLINE, tokenize.NL]:
-            self.__addToken(toktype, os.linesep, srow, scol, line)
-            return
-            
-        if toktype in [token.INDENT, token.DEDENT]:
-            self.__addToken(toktype, '', srow, scol, line)
-            return
-            
-        if toktype == token.NAME and keyword.iskeyword(toktext):
-            toktype = KEYWORD
-            
-        self.__addToken(toktype, toktext, srow, scol, line)
 
 spacer = ' '
 
@@ -181,8 +166,8 @@
         Public method used to format and print the collected statistics.
         """
         label_len = 79 - len(spacer) - 6 * 6
-        print spacer + "FUNCTION / CLASS".ljust(label_len) + \
-            " START   END LINES  NLOC  COMM EMPTY"
+        print(spacer + "FUNCTION / CLASS".ljust(label_len) + \
+            " START   END LINES  NLOC  COMM EMPTY")
         for id in self.identifiers + ['TOTAL ']:
             label = id
             counters = self.counters.get(id, {})
@@ -194,7 +179,7 @@
                 else:
                     msg += " " * 6
 
-            print msg
+            print(msg)
 
     def getCounter(self, id, key):
         """
@@ -226,9 +211,9 @@
     @param total dictionary receiving the overall code statistics
     @return a statistics object with the collected code statistics (SourceStat)
     """
-    file = open(filename, 'rb')
+    file = open(filename, 'r')
     try:
-        text = Utilities.decode(file.read())[0].encode('utf-8')
+        text = file.read()
     finally:
         file.close()
 
@@ -245,18 +230,18 @@
         # counting
         if tok.type == NEWLINE:
             stats.inc('nloc')
-        if tok.type == COMMENT:
+        elif tok.type == COMMENT:
             stats.inc('comments')
-        if tok.type == EMPTY:
+        elif tok.type == EMPTY:
             if parser.tokenlist[idx-1].type == token.OP:
                 stats.inc('nloc')
             else:
                 stats.inc('empty')
-
-        if tok.type == INDENT: stats.indent(tok)
-        if tok.type == DEDENT: stats.dedent(tok)
-
-        if tok.type == KEYWORD:
+        elif tok.type == INDENT: 
+            stats.indent(tok)
+        elif tok.type == DEDENT: 
+            stats.dedent(tok)
+        elif tok.type == KEYWORD:
             if tok.text in ("class", "def"):
                 stats.push(parser.tokenlist[idx+1].text, tok.row)
 
@@ -287,14 +272,14 @@
     
     summarize(total, 'files', len(files))
     for file in files:
-        print file
+        print(file)
         stats = analyze(file, total)
         stats.dump()
         
-    print "\nSummary"
+    print("\nSummary")
     for key in ['files', 'lines', 'bytes', 'comments',
                 'empty lines', 'non-commentary lines']:
-        print key.ljust(20) + "%6d" % total[key]
+        print(key.ljust(20) + "%6d" % total[key])
     
     sys.exit(0)
 

--- a/DataViews/CodeMetricsDialog.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/DataViews/CodeMetricsDialog.py	Sat Jan 02 15:11:35 2010 +0000
@@ -14,8 +14,8 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from Ui_CodeMetricsDialog import Ui_CodeMetricsDialog
-import CodeMetrics
+from .Ui_CodeMetricsDialog import Ui_CodeMetricsDialog
+from . import CodeMetrics
 import Utilities
 
 class CodeMetricsDialog(QDialog, Ui_CodeMetricsDialog):
@@ -96,7 +96,7 @@
                 the code metrics for (string or list of strings)
         """
         loc = QLocale()
-        if type(fn) is types.ListType:
+        if isinstance(fn, list):
             files = fn
         elif os.path.isdir(fn):
             files = Utilities.direntries(fn, True, '*.py', False)

--- a/DataViews/PyCoverageDialog.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/DataViews/PyCoverageDialog.py	Sat Jan 02 15:11:35 2010 +0000
@@ -14,10 +14,10 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from Ui_PyCoverageDialog import Ui_PyCoverageDialog
+from .Ui_PyCoverageDialog import Ui_PyCoverageDialog
 
 import Utilities
-from DebugClients.Python.coverage import coverage
+from DebugClients.Python3.coverage import coverage
 
 class PyCoverageDialog(QDialog, Ui_PyCoverageDialog):
     """
@@ -137,7 +137,7 @@
         
         self.cfn = "%s.coverage" % self.basename
         
-        if type(fn) is types.ListType:
+        if isinstance(fn, list):
             files = fn
             self.path = os.path.dirname(cfn)
         elif os.path.isdir(fn):

--- a/DataViews/PyProfileDialog.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/DataViews/PyProfileDialog.py	Sat Jan 02 15:11:35 2010 +0000
@@ -14,7 +14,7 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from Ui_PyProfileDialog import Ui_PyProfileDialog
+from .Ui_PyProfileDialog import Ui_PyProfileDialog
 import Utilities
 
 from eric4config import getConfig
@@ -157,7 +157,7 @@
             self.resultList.setSortingEnabled(False)
             
             # now go through all the files
-            for func, (cc, nc, tt, ct, callers) in self.stats.items():
+            for func, (cc, nc, tt, ct, callers) in list(self.stats.items()):
                 if self.cancelled:
                     return
                 

--- a/DebugClients/Python3/DebugBase.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/DebugClients/Python3/DebugBase.py	Sat Jan 02 15:11:35 2010 +0000
@@ -577,12 +577,15 @@
         exctype, excval, exctb = excinfo
         if exctype in [SystemExit, bdb.BdbQuit]:
             atexit._run_exitfuncs()
-            self._dbgClient.progTerminated(excval)
+            if isinstance(excval, int):
+                self._dbgClient.progTerminated(excval)
+            else:
+                self._dbgClient.progTerminated(excval.code)
             return
         
         elif exctype in [SyntaxError, IndentationError]:
             try:
-                message, (filename, linenr, charnr, text) = excval.args
+                message, (filename, linenr, charnr, text) = excval[0], excval[1]
             except ValueError:
                 exclist = []
             else:
@@ -601,9 +604,7 @@
             else:
                 exctypetxt = str(exctype)
             try:
-                exclist = [exctypetxt, 
-                           str(excval).encode(
-                                self._dbgClient.getCoding(), 'backslashreplace')]
+                exclist = [exctypetxt, str(excval)]
             except TypeError:
                 exclist = [exctypetxt, str(excval)]
             

--- a/DebugClients/Python3/DebugClientBase.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/DebugClients/Python3/DebugClientBase.py	Sat Jan 02 15:11:35 2010 +0000
@@ -348,7 +348,7 @@
         except SyntaxError:
             exctype, excval, exctb = sys.exc_info()
             try:
-                message, (filename, linenr, charnr, text) = excval.args
+                message, (filename, linenr, charnr, text) = excval[0], excval[1]
             except ValueError:
                 exclist = []
             else:

--- a/Debugger/BreakPointViewer.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Debugger/BreakPointViewer.py	Sat Jan 02 15:11:35 2010 +0000
@@ -12,7 +12,7 @@
 
 from E4Gui.E4Application import e4App
 
-from EditBreakpointDialog import EditBreakpointDialog
+from .EditBreakpointDialog import EditBreakpointDialog
 
 class BreakPointViewer(QTreeView):
     """
@@ -428,7 +428,7 @@
         
         @return count of items selected (integer)
         """
-        count = len(self.selectedIndexes()) / (self.__model.columnCount() - 1)
+        count = len(self.selectedIndexes()) // (self.__model.columnCount() - 1)
         # column count is 1 greater than selectable
         return count
     

--- a/Debugger/DebugServer.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Debugger/DebugServer.py	Sat Jan 02 15:11:35 2010 +0000
@@ -18,9 +18,9 @@
 
 from E4Gui.E4Application import e4App
 
-from BreakPointModel import BreakPointModel
-from WatchPointModel import WatchPointModel
-import DebugClientCapabilities
+from .BreakPointModel import BreakPointModel
+from .WatchPointModel import WatchPointModel
+from . import DebugClientCapabilities
 
 import Preferences
 import Utilities
@@ -218,7 +218,7 @@
             interactive shell should be returned
         @return list of supported languages (list of strings)
         """
-        languages = self.__clientCapabilities.keys()
+        languages = list(self.__clientCapabilities.keys())
         try:
             del languages[languages.index("None")]
         except ValueError:
@@ -239,7 +239,7 @@
         @return tuple of extensions associated with the language (tuple of strings)
         """
         extensions = []
-        for ext, lang in self.__clientAssociations.items():
+        for ext, lang in list(self.__clientAssociations.items()):
             if lang == language:
                 extensions.append(ext)
         
@@ -255,19 +255,19 @@
             if clientType is None:
                 clientType = self.clientType
             if clientType == "Python":
-                from DebuggerInterfacePython import DebuggerInterfacePython
+                from .DebuggerInterfacePython import DebuggerInterfacePython
                 self.debuggerInterface = DebuggerInterfacePython(self, self.passive)
             elif clientType == "Python3":
-                from DebuggerInterfacePython3 import DebuggerInterfacePython3
+                from .DebuggerInterfacePython3 import DebuggerInterfacePython3
                 self.debuggerInterface = DebuggerInterfacePython3(self, self.passive)
             elif clientType == "Ruby":
-                from DebuggerInterfaceRuby import DebuggerInterfaceRuby
+                from .DebuggerInterfaceRuby import DebuggerInterfaceRuby
                 self.debuggerInterface = DebuggerInterfaceRuby(self, self.passive)
             elif clientType == "None":
-                from DebuggerInterfaceNone import DebuggerInterfaceNone
+                from .DebuggerInterfaceNone import DebuggerInterfaceNone
                 self.debuggerInterface = DebuggerInterfaceNone(self, self.passive)
             else:
-                from DebuggerInterfaceNone import DebuggerInterfaceNone
+                from .DebuggerInterfaceNone import DebuggerInterfaceNone
                 self.debuggerInterface = DebuggerInterfaceNone(self, self.passive)
                 self.clientType = "None"
         
@@ -352,14 +352,18 @@
         """
         Private slot to process client output received via stdout.
         """
-        output = unicode(self.clientProcess.readAllStandardOutput())
+        output = str(self.clientProcess.readAllStandardOutput(), 
+                     Preferences.getSystem("IOEncoding"), 
+                     'replace')
         self.emit(SIGNAL("clientProcessStdout"), output)
         
     def __clientProcessError(self):
         """
         Private slot to process client output received via stderr.
         """
-        error = unicode(self.clientProcess.readAllStandardError())
+        error = str(self.clientProcess.readAllStandardError(), 
+                    Preferences.getSystem("IOEncoding"), 
+                    'replace')
         self.emit(SIGNAL("clientProcessStderr"), error)
         
     def __clientClearBreakPoint(self, fn, lineno):
@@ -1201,7 +1205,7 @@
         @param fn filename of the debugged script (string)
         @param exc flag to enable exception reporting of the IDE (boolean)
         """
-        print self.trUtf8("Passive debug connection received")
+        print(self.trUtf8("Passive debug connection received"))
         self.passiveClientExited = False
         self.debugging = True
         self.__restoreBreakpoints()
@@ -1214,7 +1218,7 @@
         """
         self.passiveClientExited = True
         self.shutdownServer()
-        print self.trUtf8("Passive debug connection closed")
+        print(self.trUtf8("Passive debug connection closed"))
         
     def __restoreBreakpoints(self):
         """

--- a/Debugger/DebugUI.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Debugger/DebugUI.py	Sat Jan 02 15:11:35 2010 +0000
@@ -13,12 +13,12 @@
 from PyQt4.QtGui import *
 
 from UI.Info import *
-from VariablesFilterDialog import *
-from ExceptionsFilterDialog import *
-from StartDialog import *
-from EditBreakpointDialog import EditBreakpointDialog
+from .VariablesFilterDialog import *
+from .ExceptionsFilterDialog import *
+from .StartDialog import *
+from .EditBreakpointDialog import EditBreakpointDialog
 
-from DebugClientCapabilities import *
+from .DebugClientCapabilities import *
 import Preferences
 import Utilities
 import UI.PixmapCache

--- a/Debugger/DebugViewer.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Debugger/DebugViewer.py	Sat Jan 02 15:11:35 2010 +0000
@@ -25,10 +25,10 @@
 from PyQt4.QtGui import *
 
 from QScintilla.Shell import Shell
-from VariablesViewer import VariablesViewer
-from ExceptionLogger import ExceptionLogger
-from BreakPointViewer import BreakPointViewer
-from WatchPointViewer import WatchPointViewer
+from .VariablesViewer import VariablesViewer
+from .ExceptionLogger import ExceptionLogger
+from .BreakPointViewer import BreakPointViewer
+from .WatchPointViewer import WatchPointViewer
 
 import Utilities
 import UI.PixmapCache

--- a/Debugger/DebuggerInterfacePython.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Debugger/DebuggerInterfacePython.py	Sat Jan 02 15:11:35 2010 +0000
@@ -17,8 +17,8 @@
 
 from E4Gui.E4Application import e4App
 
-from DebugProtocol import *
-import DebugClientCapabilities
+from .DebugProtocol import *
+from . import DebugClientCapabilities
 
 import Preferences
 import Utilities
@@ -122,7 +122,7 @@
         proc = QProcess()
         if environment is not None:
             env = []
-            for key, value in environment.items():
+            for key, value in list(environment.items()):
                 env.append("%s=%s" % (key, value))
             proc.setEnvironment(env)
         args = []
@@ -412,7 +412,7 @@
         
         @param env environment settings (dictionary)
         """
-        self.__sendCommand('%s%s\n' % (RequestEnv, unicode(env)))
+        self.__sendCommand('%s%s\n' % (RequestEnv, str(env)))
         
     def remoteLoad(self, fn, argv, wd, traceInterpreter = False, autoContinue = True, 
                    autoFork = False, forkChild = False):
@@ -435,7 +435,7 @@
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('%s%s\n' % (RequestForkMode, repr((autoFork, forkChild))))
         self.__sendCommand('%s%s|%s|%s|%d\n' % \
-            (RequestLoad, wd, fn, unicode(Utilities.parseOptionString(argv)),
+            (RequestLoad, wd, fn, str(Utilities.parseOptionString(argv)),
              traceInterpreter))
         
     def remoteRun(self, fn, argv, wd):
@@ -449,7 +449,7 @@
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('%s%s|%s|%s\n' % \
-            (RequestRun, wd, fn, unicode(Utilities.parseOptionString(argv))))
+            (RequestRun, wd, fn, str(Utilities.parseOptionString(argv))))
         
     def remoteCoverage(self, fn, argv, wd, erase = False):
         """
@@ -464,7 +464,7 @@
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('%s%s@@%s@@%s@@%d\n' % \
-            (RequestCoverage, wd, fn, unicode(Utilities.parseOptionString(argv)),
+            (RequestCoverage, wd, fn, str(Utilities.parseOptionString(argv)),
              erase))
 
     def remoteProfile(self, fn, argv, wd, erase = False):
@@ -479,7 +479,7 @@
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('%s%s|%s|%s|%d\n' % \
-            (RequestProfile, wd, fn, unicode(Utilities.parseOptionString(argv)), erase))
+            (RequestProfile, wd, fn, str(Utilities.parseOptionString(argv)), erase))
 
     def remoteStatement(self, stmt):
         """
@@ -621,7 +621,7 @@
         @param framenr framenumber of the variables to retrieve (int)
         """
         self.__sendCommand('%s%d, %d, %s\n' % \
-            (RequestVariables, framenr, scope, unicode(filter)))
+            (RequestVariables, framenr, scope, str(filter)))
         
     def remoteClientVariable(self, scope, filter, var, framenr = 0):
         """
@@ -633,7 +633,7 @@
         @param framenr framenumber of the variables to retrieve (int)
         """
         self.__sendCommand('%s%s, %d, %d, %s\n' % \
-            (RequestVariable, unicode(var), framenr, scope, str(filter)))
+            (RequestVariable, str(var), framenr, scope, str(filter)))
         
     def remoteClientSetFilter(self, scope, filter):
         """
@@ -732,16 +732,15 @@
         while self.qsock and self.qsock.canReadLine():
             qs = self.qsock.readLine()
             if self.codec is not None:
-                us = self.codec.fromUnicode(unicode(qs))
+                line = self.codec.toUnicode(qs)
             else:
-                us = qs
-            line = str(us)
+                line = bytes(qs).decode()
             if line.endswith(EOT):
                 line = line[:-len(EOT)]
                 if not line:
                     continue
             
-##            print "Server: ", line          ##debug
+##            print("Server: ", line)          ##debug
             
             eoc = line.find('<') + 1
             

--- a/Debugger/DebuggerInterfacePython3.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Debugger/DebuggerInterfacePython3.py	Sat Jan 02 15:11:35 2010 +0000
@@ -17,8 +17,8 @@
 
 from E4Gui.E4Application import e4App
 
-from DebugProtocol import *
-import DebugClientCapabilities
+from .DebugProtocol import *
+from . import DebugClientCapabilities
 
 import Preferences
 import Utilities
@@ -129,7 +129,7 @@
         proc = QProcess()
         if environment is not None:
             env = []
-            for key, value in environment.items():
+            for key, value in list(environment.items()):
                 env.append("%s=%s" % (key, value))
             proc.setEnvironment(env)
         args = []
@@ -420,7 +420,7 @@
         
         @param env environment settings (dictionary)
         """
-        self.__sendCommand('%s%s\n' % (RequestEnv, unicode(env)))
+        self.__sendCommand('%s%s\n' % (RequestEnv, str(env)))
     
     def remoteLoad(self, fn, argv, wd, traceInterpreter = False, autoContinue = True, 
                    autoFork = False, forkChild = False):
@@ -443,7 +443,7 @@
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('%s%s\n' % (RequestForkMode, repr((autoFork, forkChild))))
         self.__sendCommand('%s%s|%s|%s|%d\n' % \
-            (RequestLoad, wd, fn, unicode(Utilities.parseOptionString(argv)), 
+            (RequestLoad, wd, fn, str(Utilities.parseOptionString(argv)), 
              traceInterpreter))
     
     def remoteRun(self, fn, argv, wd):
@@ -457,7 +457,7 @@
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('%s%s|%s|%s\n' % \
-            (RequestRun, wd, fn, unicode(Utilities.parseOptionString(argv))))
+            (RequestRun, wd, fn, str(Utilities.parseOptionString(argv))))
     
     def remoteCoverage(self, fn, argv, wd, erase = False):
         """
@@ -472,7 +472,7 @@
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('%s%s@@%s@@%s@@%d\n' % \
-            (RequestCoverage, wd, fn, unicode(Utilities.parseOptionString(argv)),
+            (RequestCoverage, wd, fn, str(Utilities.parseOptionString(argv)),
              erase))
 
     def remoteProfile(self, fn, argv, wd, erase = False):
@@ -487,7 +487,7 @@
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('%s%s|%s|%s|%d\n' % \
-            (RequestProfile, wd, fn, unicode(Utilities.parseOptionString(argv)), erase))
+            (RequestProfile, wd, fn, str(Utilities.parseOptionString(argv)), erase))
 
     def remoteStatement(self, stmt):
         """
@@ -629,7 +629,7 @@
         @param framenr framenumber of the variables to retrieve (int)
         """
         self.__sendCommand('%s%d, %d, %s\n' % \
-            (RequestVariables, framenr, scope, unicode(filter)))
+            (RequestVariables, framenr, scope, str(filter)))
     
     def remoteClientVariable(self, scope, filter, var, framenr = 0):
         """
@@ -740,16 +740,15 @@
         while self.qsock and self.qsock.canReadLine():
             qs = self.qsock.readLine()
             if self.codec is not None:
-                us = self.codec.fromUnicode(unicode(qs))
+                line = self.codec.toUnicode(qs)
             else:
-                us = qs
-            line = str(us)
+                line = bytes(qs).decode()
             if line.endswith(EOT):
                 line = line[:-len(EOT)]
                 if not line:
                     continue
             
-##            print "Server: ", line          ##debug
+##            print("Server: ", line)          ##debug
             
             eoc = line.find('<') + 1
             

--- a/Debugger/DebuggerInterfaceRuby.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Debugger/DebuggerInterfaceRuby.py	Sat Jan 02 15:11:35 2010 +0000
@@ -17,8 +17,8 @@
 
 from E4Gui.E4Application import e4App
 
-from DebugProtocol import *
-import DebugClientCapabilities
+from .DebugProtocol import *
+from . import DebugClientCapabilities
 
 import Preferences
 import Utilities
@@ -118,7 +118,7 @@
         proc = QProcess()
         if environment is not None:
             env = []
-            for key, value in environment.items():
+            for key, value in list(environment.items()):
                 env.append("%s=%s" % (key, value))
             proc.setEnvironment(env)
         args = []
@@ -413,7 +413,7 @@
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('%s%s|%s|%s|%d\n' % \
-            (RequestLoad, wd, fn, unicode(Utilities.parseOptionString(argv)), 
+            (RequestLoad, wd, fn, str(Utilities.parseOptionString(argv)), 
              traceInterpreter))
         
     def remoteRun(self, fn, argv, wd):
@@ -427,7 +427,7 @@
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('%s%s|%s|%s\n' % \
-            (RequestRun, wd, fn, unicode(Utilities.parseOptionString(argv))))
+            (RequestRun, wd, fn, str(Utilities.parseOptionString(argv))))
         
     def remoteCoverage(self, fn, argv, wd, erase = False):
         """
@@ -592,7 +592,7 @@
         @param framenr framenumber of the variables to retrieve (int)
         """
         self.__sendCommand('%s%d, %d, %s\n' % \
-            (RequestVariables, framenr, scope, unicode(filter)))
+            (RequestVariables, framenr, scope, str(filter)))
         
     def remoteClientVariable(self, scope, filter, var, framenr = 0):
         """
@@ -604,7 +604,7 @@
         @param framenr framenumber of the variables to retrieve (int)
         """
         self.__sendCommand('%s%s, %d, %d, %s\n' % \
-            (RequestVariable, unicode(var), framenr, scope, str(filter)))
+            (RequestVariable, str(var), framenr, scope, str(filter)))
         
     def remoteClientSetFilter(self, scope, filter):
         """
@@ -685,16 +685,15 @@
         while self.qsock and self.qsock.canReadLine():
             qs = self.qsock.readLine()
             if self.codec is not None:
-                us = self.codec.fromUnicode(unicode(qs))
+                line = self.codec.toUnicode(qs)
             else:
-                us = qs
-            line = str(us)
+                line = bytes(qs).decode()
             if line.endswith(EOT):
                 line = line[:-len(EOT)]
                 if not line:
                     continue
             
-##            print "Server: ", line          ##debug
+##            print("Server: ", line)          ##debug
             
             eoc = line.find('<') + 1
             

--- a/Debugger/EditBreakpointDialog.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Debugger/EditBreakpointDialog.py	Sat Jan 02 15:11:35 2010 +0000
@@ -14,7 +14,7 @@
 
 from E4Gui.E4Completers import E4FileCompleter
 
-from Ui_EditBreakpointDialog import Ui_EditBreakpointDialog
+from .Ui_EditBreakpointDialog import Ui_EditBreakpointDialog
 
 import Utilities
 

--- a/Debugger/EditWatchpointDialog.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Debugger/EditWatchpointDialog.py	Sat Jan 02 15:11:35 2010 +0000
@@ -10,7 +10,7 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from Ui_EditWatchpointDialog import Ui_EditWatchpointDialog
+from .Ui_EditWatchpointDialog import Ui_EditWatchpointDialog
 
 
 class EditWatchpointDialog(QDialog, Ui_EditWatchpointDialog):

--- a/Debugger/ExceptionsFilterDialog.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Debugger/ExceptionsFilterDialog.py	Sat Jan 02 15:11:35 2010 +0000
@@ -10,7 +10,7 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from Ui_ExceptionsFilterDialog import Ui_ExceptionsFilterDialog
+from .Ui_ExceptionsFilterDialog import Ui_ExceptionsFilterDialog
 
 class ExceptionsFilterDialog(QDialog, Ui_ExceptionsFilterDialog):
     """

--- a/Debugger/StartDialog.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Debugger/StartDialog.py	Sat Jan 02 15:11:35 2010 +0000
@@ -60,16 +60,16 @@
         
         self.type = type
         if type == 0:
-            from Ui_StartDebugDialog import Ui_StartDebugDialog
+            from .Ui_StartDebugDialog import Ui_StartDebugDialog
             self.ui = Ui_StartDebugDialog()
         elif type == 1:
-            from Ui_StartRunDialog import Ui_StartRunDialog
+            from .Ui_StartRunDialog import Ui_StartRunDialog
             self.ui = Ui_StartRunDialog()
         elif type == 2:
-            from Ui_StartCoverageDialog import Ui_StartCoverageDialog
+            from .Ui_StartCoverageDialog import Ui_StartCoverageDialog
             self.ui = Ui_StartCoverageDialog()
         elif type == 3:
-            from Ui_StartProfileDialog import Ui_StartProfileDialog
+            from .Ui_StartProfileDialog import Ui_StartProfileDialog
             self.ui = Ui_StartProfileDialog()
         self.ui.setupUi(self)
         

--- a/Debugger/VariableDetailDialog.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Debugger/VariableDetailDialog.py	Sat Jan 02 15:11:35 2010 +0000
@@ -10,7 +10,7 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from Ui_VariableDetailDialog import Ui_VariableDetailDialog
+from .Ui_VariableDetailDialog import Ui_VariableDetailDialog
 
 class VariableDetailDialog(QDialog, Ui_VariableDetailDialog):
     """

--- a/Debugger/VariablesFilterDialog.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Debugger/VariablesFilterDialog.py	Sat Jan 02 15:11:35 2010 +0000
@@ -13,7 +13,7 @@
 from Debugger.Config import ConfigVarTypeDispStrings
 import Preferences
 
-from Ui_VariablesFilterDialog import Ui_VariablesFilterDialog
+from .Ui_VariablesFilterDialog import Ui_VariablesFilterDialog
 
 
 class VariablesFilterDialog(QDialog, Ui_VariablesFilterDialog):

--- a/Debugger/VariablesViewer.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Debugger/VariablesViewer.py	Sat Jan 02 15:11:35 2010 +0000
@@ -16,8 +16,8 @@
 
 from E4Gui.E4Application import e4App
 
-from Config import ConfigVarTypeDispStrings, ConfigVarTypeStrings
-from VariableDetailDialog import VariableDetailDialog
+from .Config import ConfigVarTypeDispStrings, ConfigVarTypeStrings
+from .VariableDetailDialog import VariableDetailDialog
 from Utilities import toUnicode
 
 import Preferences
@@ -401,8 +401,7 @@
                 self.__addItem(None, vtype, var, value)
             
             # reexpand tree
-            openItems = self.openItems[:]
-            openItems.sort()
+            openItems = sorted(self.openItems[:])
             self.openItems = []
             for itemPath in openItems:
                 itm = self.__findItem(itemPath, 0)
@@ -451,8 +450,7 @@
             subelementsAdded = True
 
         # reexpand tree
-        openItems = self.openItems[:]
-        openItems.sort()
+        openItems = sorted(self.openItems[:])
         self.openItems = []
         for itemPath in openItems:
             itm = self.__findItem(itemPath, 0)
@@ -524,10 +522,11 @@
         @param s the string to be converted (string)
         @return unicode representation of s (unicode object)
         """
-        if type(s) is type(u""):
+        # TODO: remove me
+        if isinstance(s, type("")):
             return s
         try:
-            u = unicode(s, self.loc)
+            u = str(s, self.loc)
         except TypeError:
             u = str(s)
         except UnicodeError:

--- a/Debugger/WatchPointViewer.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Debugger/WatchPointViewer.py	Sat Jan 02 15:11:35 2010 +0000
@@ -12,7 +12,7 @@
 
 from E4Gui.E4Application import e4App
 
-from EditWatchpointDialog import EditWatchpointDialog
+from .EditWatchpointDialog import EditWatchpointDialog
 
 import Utilities
 
@@ -411,7 +411,7 @@
         
         @return count of items selected (integer)
         """
-        count = len(self.selectedIndexes()) / (self.__model.columnCount()-1)
+        count = len(self.selectedIndexes()) // (self.__model.columnCount()-1)
         # column count is 1 greater than selectable
         return count
     

--- a/DocumentationTools/APIGenerator.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/DocumentationTools/APIGenerator.py	Sat Jan 02 15:11:35 2010 +0000
@@ -85,8 +85,7 @@
         """
         Private method to generate the api section for classes.
         """
-        classNames = self.module.classes.keys()
-        classNames.sort()
+        classNames = sorted(list(self.module.classes.keys()))
         for className in classNames:
             if not self.__isPrivate(self.module.classes[className]):
                 self.__addClassVariablesAPI(className)
@@ -99,10 +98,7 @@
         @param classname Name of the class containing the method. (string)
         """
         _class = self.module.classes[className]
-        methods = _class.methods.keys()
-        methods.sort()
-        
-        # first do the constructor
+        methods = sorted(list(_class.methods.keys()))
         if '__init__' in methods:
             methods.remove('__init__')
             if _class.isPublic():
@@ -156,8 +152,7 @@
         """
         Private method to generate the api section for functions.
         """
-        funcNames = self.module.functions.keys()
-        funcNames.sort()
+        funcNames = sorted(list(self.module.functions.keys()))
         for funcName in funcNames:
             if not self.__isPrivate(self.module.functions[funcName]): 
                 if self.module.functions[funcName].isPublic():

--- a/DocumentationTools/IndexGenerator.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/DocumentationTools/IndexGenerator.py	Sat Jan 02 15:11:35 2010 +0000
@@ -10,8 +10,8 @@
 import sys
 import os
 
-import TemplatesListsStyle
-import TemplatesListsStyleCSS
+from . import TemplatesListsStyle
+from . import TemplatesListsStyleCSS
 
 from Utilities import joinext
 
@@ -131,8 +131,7 @@
         # 1) subpackages
         if package["subpackages"]:
             subpacks = package["subpackages"]
-            names = subpacks.keys()
-            names.sort()
+            names = sorted(list(subpacks.keys()))
             lst = []
             for name in names:
                 link = joinext("index-%s" % name, ".html")
@@ -148,8 +147,7 @@
         # 2) modules
         if package["modules"]:
             mods = package["modules"]
-            names = mods.keys()
-            names.sort()
+            names = sorted(list(mods.keys()))
             lst = []
             for name in names:
                 link = joinext(name, ".html")
@@ -176,7 +174,7 @@
               } + \
               self.footerTemplate
     
-        f = open(filename, "wb")
+        f = open(filename, "w")
         f.write(doc)
         f.close()
     
@@ -198,12 +196,12 @@
             basename = basename.replace(os.sep, ".")
             if not basename.endswith("."):
                 basename = "%s." % basename
-        for package, element in self.packages.items():
+        for package, element in list(self.packages.items()):
             try:
                 if basename:
                     package = package.replace(basename,"")
                 out = self.__writeIndex(package, element)
-            except IOError, v:
+            except IOError as v:
                 sys.stderr.write("%s error: %s\n" % (package, v[1]))
             else:
                 if out:

--- a/DocumentationTools/ModuleDocumentor.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/DocumentationTools/ModuleDocumentor.py	Sat Jan 02 15:11:35 2010 +0000
@@ -14,8 +14,8 @@
 import sys
 import re
 
-import TemplatesListsStyle
-import TemplatesListsStyleCSS
+from . import TemplatesListsStyle
+from . import TemplatesListsStyleCSS
 
 from Utilities import html_uencode
 from Utilities.ModuleParser import RB_SOURCE
@@ -234,7 +234,7 @@
                     'ClassList' : classList,
                     'FunctionList' : functionList,
                 }
-        except TagError, e:
+        except TagError as e:
             sys.stderr.write("Error in tags of description of module %s.\n" % \
                 self.module.name)
             sys.stderr.write("%s\n" % e)
@@ -300,8 +300,7 @@
         
         @return The classes list section. (string)
         """
-        names = self.module.classes.keys()
-        names.sort()
+        names = sorted(list(self.module.classes.keys()))
         if names:
             self.empty = False
             s = self.__genListSection(names, self.module.classes)
@@ -318,8 +317,7 @@
         
         @return The modules list section. (string)
         """
-        names = self.module.modules.keys()
-        names.sort()
+        names = sorted(list(self.module.modules.keys()))
         if names:
             self.empty = False
             s = self.__genListSection(names, self.module.modules)
@@ -335,8 +333,7 @@
         
         @return The functions list section. (string)
         """
-        names = self.module.functions.keys()
-        names.sort()
+        names = sorted(list(self.module.functions.keys()))
         if names:
             self.empty = False
             s = self.__genListSection(names, self.module.functions)
@@ -352,8 +349,7 @@
         
         @return The classes details section. (string)
         """
-        classNames = self.module.classes.keys()
-        classNames.sort()
+        classNames = sorted(list(self.module.classes.keys()))
         classes = []
         for className in classNames:
             _class = self.module.classes[className]
@@ -376,7 +372,7 @@
                     'MethodList' : methList,
                     'MethodDetails' : methBodies,
                 }
-            except TagError, e:
+            except TagError as e:
                 sys.stderr.write("Error in tags of description of class %s.\n" % \
                     className)
                 sys.stderr.write("%s\n" % e)
@@ -432,10 +428,7 @@
         """
         methList = []
         methBodies = []
-        methods = obj.methods.keys()
-        methods.sort()
-        
-        # first do the constructor
+        methods = sorted(list(obj.methods.keys()))
         if '__init__' in methods:
             methods.remove('__init__')
             try:
@@ -447,7 +440,7 @@
                         self.__formatDescription(obj.methods['__init__'].description),
                     'Params' : ', '.join(obj.methods['__init__'].parameters[1:]),
                 }
-            except TagError, e:
+            except TagError as e:
                 sys.stderr.write("Error in tags of description of method %s.%s.\n" % \
                     (className, '__init__'))
                 sys.stderr.write("%s\n" % e)
@@ -464,7 +457,7 @@
                         self.__formatDescription(obj.methods[method].description),
                     'Params' : ', '.join(obj.methods[method].parameters[1:]),
                 }
-            except TagError, e:
+            except TagError as e:
                 sys.stderr.write("Error in tags of description of method %s.%s.\n" % \
                     (className, method))
                 sys.stderr.write("%s\n" % e)
@@ -485,8 +478,7 @@
         
         @return The Ruby modules details section. (string)
         """
-        rbModulesNames = self.module.modules.keys()
-        rbModulesNames.sort()
+        rbModulesNames = sorted(list(self.module.modules.keys()))
         rbModules = []
         for rbModuleName in rbModulesNames:
             rbModule = self.module.modules[rbModuleName]
@@ -506,7 +498,7 @@
                     'FunctionsList' : methList,
                     'FunctionsDetails' : methBodies,
                 }
-            except TagError, e:
+            except TagError as e:
                 sys.stderr.write("Error in tags of description of Ruby module %s.\n" % \
                     rbModuleName)
                 sys.stderr.write("%s\n" % e)
@@ -524,8 +516,7 @@
         @param modName Name of the Ruby module containing the classes. (string)
         @return The classes list and classes details section. (tuple of two string)
         """
-        classNames = obj.classes.keys()
-        classNames.sort()
+        classNames = sorted(list(obj.classes.keys()))
         classes = []
         for className in classNames:
             _class = obj.classes[className]
@@ -547,7 +538,7 @@
                     'MethodList' : methList,
                     'MethodDetails' : methBodies,
                 }
-            except TagError, e:
+            except TagError as e:
                 sys.stderr.write("Error in tags of description of class %s.\n" % \
                     className)
                 sys.stderr.write("%s\n" % e)
@@ -594,8 +585,7 @@
         @return The functions details section. (string)
         """
         funcBodies = []
-        funcNames = self.module.functions.keys()
-        funcNames.sort()
+        funcNames = sorted(list(self.module.functions.keys()))
         for funcName in funcNames:
             try:
                 funcBody = self.functionTemplate % { \
@@ -605,7 +595,7 @@
                         self.module.functions[funcName].description),
                     'Params' : ', '.join(self.module.functions[funcName].parameters),
                 }
-            except TagError, e:
+            except TagError as e:
                 sys.stderr.write("Error in tags of description of function %s.\n" % \
                     funcName)
                 sys.stderr.write("%s\n" % e)
@@ -709,8 +699,7 @@
         @return The list section. (string)
         """
         lst = []
-        keys = dictionary.keys()
-        keys.sort()
+        keys = sorted(list(dictionary.keys()))
         for key in keys:
             lst.append(template % { \
                 'Name' : key,
@@ -795,21 +784,21 @@
         while start != -1:
             stop = desc.find('}', start + 2)
             if stop == -1:
-                raise TagError, "Unterminated inline tag.\n%s" % desc
+                raise TagError("Unterminated inline tag.\n%s" % desc)
             
             tagText = desc[start + 1:stop]
             if tagText.startswith('@link'):
                 parts = tagText.split(None, 1)
                 if len(parts) < 2:
-                    raise TagError, "Wrong format in inline tag %s.\n%s" % \
-                                    (parts[0], desc)
+                    raise TagError("Wrong format in inline tag %s.\n%s" % \
+                                    (parts[0], desc))
                 
                 formattedTag = self.__formatCrossReferenceEntry(parts[1])
                 desc = desc.replace("{%s}" % tagText, formattedTag)
             else:
                 tag = tagText.split(None, 1)[0]
-                raise TagError, "Unknown inline tag encountered, %s.\n%s" % \
-                                (tag, desc)
+                raise TagError("Unknown inline tag encountered, %s.\n%s" % \
+                                (tag, desc))
             
             start = desc.find('{@')
         
@@ -851,7 +840,7 @@
                     inTagSection = True
                     parts = desc.split(None, 2)
                     if len(parts) < 2:
-                        raise TagError, "Wrong format in %s line.\n" % parts[0]
+                        raise TagError("Wrong format in %s line.\n" % parts[0])
                     paramName = parts[1]
                     if parts[0] == "@keyparam":
                         paramName += '='
@@ -864,7 +853,7 @@
                     inTagSection = True
                     parts = desc.split(None, 1)
                     if len(parts) < 2:
-                        raise TagError, "Wrong format in %s line.\n" % parts[0]
+                        raise TagError("Wrong format in %s line.\n" % parts[0])
                     returns = [parts[1]]
                     lastItem = returns
                 elif desc.startswith("@exception") or \
@@ -873,7 +862,7 @@
                     inTagSection = True
                     parts = desc.split(None, 2)
                     if len(parts) < 2:
-                        raise TagError, "Wrong format in %s line.\n" % parts[0]
+                        raise TagError("Wrong format in %s line.\n" % parts[0])
                     excName = parts[1]
                     try:
                         exceptionDict[excName] = [parts[2]]
@@ -884,7 +873,7 @@
                     inTagSection = True
                     m = _signal(desc,0)
                     if m is None:
-                        raise TagError, "Wrong format in %s line.\n" % parts[0]
+                        raise TagError("Wrong format in %s line.\n" % parts[0])
                     signalName = 1 and m.group("SignalName1") \
                                    or m.group("SignalName2")
                     signalDesc = 1 and m.group("SignalDescription1") \
@@ -897,7 +886,7 @@
                     inTagSection = True
                     m = _event(desc,0)
                     if m is None:
-                        raise TagError, "Wrong format in %s line.\n" % parts[0]
+                        raise TagError("Wrong format in %s line.\n" % parts[0])
                     eventName = 1 and m.group("EventName1") \
                                    or m.group("EventName2")
                     eventDesc = 1 and m.group("EventDescription1") \
@@ -910,35 +899,35 @@
                     inTagSection = True
                     parts = desc.split(None, 1)
                     if len(parts) < 2:
-                        raise TagError, "Wrong format in %s line.\n" % parts[0]
+                        raise TagError("Wrong format in %s line.\n" % parts[0])
                     deprecated = [parts[1]]
                     lastItem = deprecated
                 elif desc.startswith("@author"):
                     inTagSection = True
                     parts = desc.split(None, 1)
                     if len(parts) < 2:
-                        raise TagError, "Wrong format in %s line.\n" % parts[0]
+                        raise TagError("Wrong format in %s line.\n" % parts[0])
                     authorInfo = [parts[1]]
                     lastItem = authorInfo
                 elif desc.startswith("@since"):
                     inTagSection = True
                     parts = desc.split(None, 1)
                     if len(parts) < 2:
-                        raise TagError, "Wrong format in %s line.\n" % parts[0]
+                        raise TagError("Wrong format in %s line.\n" % parts[0])
                     sinceInfo = [parts[1]]
                     lastItem = sinceInfo
                 elif desc.startswith("@see"):
                     inTagSection = True
                     parts = desc.split(None, 1)
                     if len(parts) < 2:
-                        raise TagError, "Wrong format in %s line.\n" % parts[0]
+                        raise TagError("Wrong format in %s line.\n" % parts[0])
                     seeList.append([parts[1]])
                     lastItem = seeList[-1]
                 elif desc.startswith("@@"):
                     lastItem.append(desc[1:])
                 elif desc.startswith("@"):
                     tag = desc.split(None, 1)[0]
-                    raise TagError, "Unknown tag encountered, %s.\n" % tag
+                    raise TagError("Unknown tag encountered, %s.\n" % tag)
                 else:
                     lastItem.append(ditem)
             elif not inTagSection:

--- a/E4Graphics/E4GraphicsView.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/E4Graphics/E4GraphicsView.py	Sat Jan 02 15:11:35 2010 +0000
@@ -133,11 +133,11 @@
         @param border border width to include in the calculation (integer)
         @return the minimum rectangle (QRectF)
         """
-        startx = sys.maxint
-        starty = sys.maxint
+        startx = sys.maxsize
+        starty = sys.maxsize
         endx = 0
         endy = 0
-        items = self.filteredItems(self.scene().items())
+        items = self.filteredItems(list(self.scene().items()))
         for itm in items:
             rect = itm.sceneBoundingRect()
             itmEndX = rect.x() + rect.width()
@@ -169,7 +169,7 @@
         """
         endx = 0
         endy = 0
-        items = self.filteredItems(self.scene().items())
+        items = self.filteredItems(list(self.scene().items()))
         for itm in items:
             rect = itm.sceneBoundingRect()
             itmEndX = rect.x() + rect.width()

--- a/E4Gui/E4Action.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/E4Gui/E4Action.py	Sat Jan 02 15:11:35 2010 +0000
@@ -22,7 +22,7 @@
         """
         Constructor
         """
-        self.errorMessage = unicode(error)
+        self.errorMessage = str(error)
         
     def __repr__(self):
         """
@@ -30,7 +30,7 @@
         
         @return string representing the error message
         """
-        return unicode(self.errorMessage)
+        return str(self.errorMessage)
         
     def __str__(self):
         """

--- a/E4Gui/E4Application.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/E4Gui/E4Application.py	Sat Jan 02 15:11:35 2010 +0000
@@ -33,7 +33,7 @@
         @param object reference to the object
         @exception KeyError raised when the given name is already in use
         """
-        if self.__objectRegistry.has_key(name):
+        if name in self.__objectRegistry:
             raise KeyError('Object "%s" already registered.' % name)
         else:
             self.__objectRegistry[name] = object
@@ -46,7 +46,7 @@
         @return reference to the registered object
         @exception KeyError raised when the given name is not known
         """
-        if self.__objectRegistry.has_key(name):
+        if name in self.__objectRegistry:
             return self.__objectRegistry[name]
         else:
             raise KeyError('Object "%s" is not registered.' % name)
@@ -60,7 +60,7 @@
         @keyparam pluginType type of the plugin object (string)
         @exception KeyError raised when the given name is already in use
         """
-        if self.__pluginObjectRegistry.has_key(name):
+        if name in self.__pluginObjectRegistry:
             raise KeyError('Pluginobject "%s" already registered.' % name)
         else:
             self.__pluginObjectRegistry[name] = (object, pluginType)
@@ -71,7 +71,7 @@
         
         @param name name of the plugin object (string)
         """
-        if self.__pluginObjectRegistry.has_key(name):
+        if name in self.__pluginObjectRegistry:
             del self.__pluginObjectRegistry[name]
         
     def getPluginObject(self, name):
@@ -82,7 +82,7 @@
         @return reference to the registered plugin object
         @exception KeyError raised when the given name is not known
         """
-        if self.__pluginObjectRegistry.has_key(name):
+        if name in self.__pluginObjectRegistry:
             return self.__pluginObjectRegistry[name][0]
         else:
             raise KeyError('Pluginobject "%s" is not registered.' % name)
@@ -107,7 +107,7 @@
         @return type of the plugin object (string)
         @exception KeyError raised when the given name is not known
         """
-        if self.__pluginObjectRegistry.has_key(name):
+        if name in self.__pluginObjectRegistry:
             return self.__pluginObjectRegistry[name][1]
         else:
             raise KeyError('Pluginobject "%s" is not registered.' % name)

--- a/E4Gui/E4ModelToolBar.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/E4Gui/E4ModelToolBar.py	Sat Jan 02 15:11:35 2010 +0000
@@ -10,7 +10,7 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from E4ModelMenu import E4ModelMenu
+from .E4ModelMenu import E4ModelMenu
 
 class E4ModelToolBar(QToolBar):
     """

--- a/E4Gui/E4ToolBarDialog.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/E4Gui/E4ToolBarDialog.py	Sat Jan 02 15:11:35 2010 +0000
@@ -10,7 +10,7 @@
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
 
-from Ui_E4ToolBarDialog import Ui_E4ToolBarDialog
+from .Ui_E4ToolBarDialog import Ui_E4ToolBarDialog
 
 import UI.PixmapCache
 
@@ -78,7 +78,7 @@
                 item.setText(0, action.text())
                 item.setIcon(0, action.icon())
                 item.setTextAlignment(0, Qt.AlignLeft | Qt.AlignVCenter)
-                item.setData(0, E4ToolBarDialog.ActionIdRole, long(id(action)))
+                item.setData(0, E4ToolBarDialog.ActionIdRole, int(id(action)))
                 item.setData(0, E4ToolBarDialog.WidgetActionRole, False)
                 if self.__manager.isWidgetAction(action):
                     item.setData(0, E4ToolBarDialog.WidgetActionRole, True)
@@ -86,7 +86,7 @@
                     self.__widgetActionToToolBarItemID[id(action)] = None
             categoryItem.setExpanded(True)
         
-        for tbID, actions in self.__manager.toolBarsActions().items():
+        for tbID, actions in list(self.__manager.toolBarsActions().items()):
             tb = self.__manager.toolBarById(tbID)
             default = self.__manager.isDefaultToolBar(tb)
             tbItem = E4ToolBarItem(tbID, [], default)
@@ -103,7 +103,7 @@
                         self.__widgetActionToToolBarItemID[aID] = id(tbItem)
                         self.__toolBarItemToWidgetActionID[id(tbItem)].append(aID)
             tbItem.actionIDs = actionIDs
-            self.toolbarComboBox.addItem(tb.windowTitle(), long(id(tbItem)))
+            self.toolbarComboBox.addItem(tb.windowTitle(), int(id(tbItem)))
             if default:
                 self.toolbarComboBox.setItemData(self.toolbarComboBox.count() - 1, 
                     QColor(Qt.darkGreen), Qt.ForegroundRole)
@@ -139,7 +139,7 @@
             tbItem.isChanged = True
             self.__toolbarItems[id(tbItem)] = tbItem
             self.__toolBarItemToWidgetActionID[id(tbItem)] = []
-            self.toolbarComboBox.addItem(name, long(id(tbItem)))
+            self.toolbarComboBox.addItem(name, int(id(tbItem)))
             self.toolbarComboBox.model().sort(0)
             self.toolbarComboBox.setCurrentIndex(self.toolbarComboBox.findText(name))
     
@@ -241,7 +241,7 @@
                 item.setText(action.text())
                 item.setIcon(action.icon())
                 item.setTextAlignment(Qt.AlignLeft | Qt.AlignVCenter)
-                item.setData(E4ToolBarDialog.ActionIdRole, long(id(action)))
+                item.setData(E4ToolBarDialog.ActionIdRole, int(id(action)))
                 item.setData(E4ToolBarDialog.WidgetActionRole, False)
                 if self.__manager.isWidgetAction(action):
                     item.setData(E4ToolBarDialog.WidgetActionRole, True)
@@ -335,7 +335,7 @@
             item.setText(action.text())
             item.setIcon(action.icon())
             item.setTextAlignment(Qt.AlignLeft | Qt.AlignVCenter)
-            item.setData(E4ToolBarDialog.ActionIdRole, long(id(action)))
+            item.setData(E4ToolBarDialog.ActionIdRole, int(id(action)))
             item.setData(E4ToolBarDialog.WidgetActionRole, False)
             if self.__manager.isWidgetAction(action):
                 item.setData(E4ToolBarDialog.WidgetActionRole, True)
@@ -386,7 +386,7 @@
         self.__removedToolBarIDs = []
         
         # step 2: save configured toolbars
-        for tbItem in self.__toolbarItems.values():
+        for tbItem in list(self.__toolbarItems.values()):
             if not tbItem.isChanged:
                 continue
             

--- a/E4Gui/E4ToolBarManager.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/E4Gui/E4ToolBarManager.py	Sat Jan 02 15:11:35 2010 +0000
@@ -55,7 +55,7 @@
         @param name object name of the toolbar (string)
         @return reference to the toolbar (QToolBar)
         """
-        for toolBar in self.__allToolBars.values():
+        for toolBar in list(self.__allToolBars.values()):
             if toolBar.objectName() == name:
                 return toolBar
         return None
@@ -68,12 +68,12 @@
         @return reference to the action (QAction)
         """
         # check objectName() first
-        for action in self.__allActions.values():
+        for action in list(self.__allActions.values()):
             if action.objectName() == name:
                 return action
         
         # check text() next
-        for action in self.__allActions.values():
+        for action in list(self.__allActions.values()):
             if action.text() == name:
                 return action
         
@@ -188,7 +188,7 @@
         @param toolBars dictionary with toolbar id as key and
             a list of actions as value
         """
-        for key, actions in toolBars.items():
+        for key, actions in list(toolBars.items()):
             tb = self.__allToolBars[key]
             self.setToolBar(tb, actions)
     
@@ -278,7 +278,7 @@
         
         @return list of all default toolbars (list of QToolBar)
         """
-        return self.__defaultToolBars.values()
+        return list(self.__defaultToolBars.values())
     
     def isDefaultToolBar(self, toolBar):
         """
@@ -370,7 +370,7 @@
         
         @return list of all toolbars (list of QToolBar)
         """
-        return self.__allToolBars.values()
+        return list(self.__allToolBars.values())
     
     def addAction(self, action, category):
         """
@@ -450,18 +450,18 @@
         for tbID in self.__defaultToolBars:
             tb = self.__allToolBars[tbID]
             if tb.objectName():
-                stream.writeString(tb.objectName())
+                stream.writeString(tb.objectName().encode())
             else:
-                stream.writeString(tb.windowTitle())
+                stream.writeString(tb.windowTitle().encode())
             stream.writeUInt16(len(self.__toolBars[tbID]))
             for action in self.__toolBars[tbID]:
                 if action is not None:
                     if action.objectName():
-                        stream.writeString(action.objectName())
+                        stream.writeString(action.objectName().encode())
                     else:
-                        stream.writeString(action.text())
+                        stream.writeString(action.text().encode())
                 else:
-                    stream.writeString("")
+                    stream.writeString("".encode())
         
         # save the custom toolbars
         stream.writeUInt16(E4ToolBarManager.CustomToolBarMarker)
@@ -469,17 +469,17 @@
         for tbID in self.__toolBars:
             if tbID not in self.__defaultToolBars:
                 tb = self.__allToolBars[tbID]
-                stream.writeString(tb.objectName())
-                stream.writeString(tb.windowTitle())
+                stream.writeString(tb.objectName().encode())
+                stream.writeString(tb.windowTitle().encode())
                 stream.writeUInt16(len(self.__toolBars[tbID]))
                 for action in self.__toolBars[tbID]:
                     if action is not None:
                         if action.objectName():
-                            stream.writeString(action.objectName())
+                            stream.writeString(action.objectName().encode())
                         else:
-                            stream.writeString(action.text())
+                            stream.writeString(action.text().encode())
                     else:
-                        stream.writeString("")
+                        stream.writeString("".encode())
         
         return data
     
@@ -507,11 +507,11 @@
         
         toolBarCount = stream.readUInt16()
         for i in range(toolBarCount):
-            objectName = stream.readString()
+            objectName = stream.readString().decode()
             actionCount = stream.readUInt16()
             actions = []
             for j in range(actionCount):
-                actionName = stream.readString()
+                actionName = stream.readString().decode()
                 if actionName:
                     action = self.__findAction(actionName)
                     if action is not None:
@@ -530,12 +530,12 @@
         
         toolBarCount = stream.readUInt16()
         for i in range(toolBarCount):
-            objectName = stream.readString()
-            toolBarTitle = stream.readString()
+            objectName = stream.readString().decode()
+            toolBarTitle = stream.readString().decode()
             actionCount = stream.readUInt16()
             actions = []
             for j in range(actionCount):
-                actionName = stream.readString()
+                actionName = stream.readString().decode()
                 if actionName:
                     action = self.__findAction(actionName)
                     if action is not None:
@@ -576,7 +576,7 @@
         @param actions dictionary with toolbar id as key and
             a list of widget actions as value
         """
-        for tbID in actions.keys()[:]:
+        for tbID in list(actions.keys())[:]:
             toolBar = self.__allToolBars[tbID]
             newActions = self.__toolBars[tbID][:]
             newActionsWithSeparators = self.__toolBarsWithSeparators[tbID][:]
@@ -611,7 +611,7 @@
         
         @return list of categories (list of string)
         """
-        return self.__categoryToActions.keys()
+        return list(self.__categoryToActions.keys())
     
     def categoryActions(self, category):
         """

--- a/E4Gui/E4ToolBox.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/E4Gui/E4ToolBox.py	Sat Jan 02 15:11:35 2010 +0000
@@ -9,7 +9,7 @@
 
 from PyQt4.QtGui import QToolBox, QTabWidget
 
-from E4TabWidget import E4TabWidget
+from .E4TabWidget import E4TabWidget
 
 class E4VerticalToolBox(QToolBox):
     """

--- a/E4Network/E4NetworkHeaderDetailsDialog.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/E4Network/E4NetworkHeaderDetailsDialog.py	Sat Jan 02 15:11:35 2010 +0000
@@ -10,7 +10,7 @@
 from PyQt4.QtGui import QDialog
 from PyQt4.QtCore import pyqtSlot
 
-from Ui_E4NetworkHeaderDetailsDialog import Ui_E4NetworkHeaderDetailsDialog
+from .Ui_E4NetworkHeaderDetailsDialog import Ui_E4NetworkHeaderDetailsDialog
 
 class E4NetworkHeaderDetailsDialog(QDialog, Ui_E4NetworkHeaderDetailsDialog):
     """