eric: changeset 1112:8a7d1b9d18db

--- a/DataViews/CodeMetricsDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/DataViews/CodeMetricsDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,9 @@
 import os
 import fnmatch

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot, Qt, QLocale
+from PyQt4.QtGui import QDialog, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem, \
+    QApplication

 from .Ui_CodeMetricsDialog import Ui_CodeMetricsDialog
 from . import CodeMetrics
--- a/DataViews/PyCoverageDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/DataViews/PyCoverageDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,9 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot, Qt
+from PyQt4.QtGui import QDialog, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem, \
+    QApplication, QProgressDialog

 from .Ui_PyCoverageDialog import Ui_PyCoverageDialog
--- a/DataViews/PyProfileDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/DataViews/PyProfileDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,9 @@
 import os
 import pickle

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt
+from PyQt4.QtGui import QDialog, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem, \
+    QApplication

 from E5Gui import E5MessageBox
--- a/DebugClients/Python/DCTestResult.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/DebugClients/Python/DCTestResult.py	Sun Jun 05 18:25:36 2011 +0200
@@ -12,7 +12,8 @@
 from unittest import TestResult


-from DebugProtocol import *
+from DebugProtocol import ResponseUTTestFailed, ResponseUTTestErrored, \
+    ResponseUTStartTest, ResponseUTStopTest


 class DCTestResult(TestResult):
--- a/DebugClients/Python/DebugBase.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/DebugClients/Python/DebugBase.py	Sun Jun 05 18:25:36 2011 +0200
@@ -14,7 +14,8 @@
 import atexit
 import inspect

-from DebugProtocol import *
+from DebugProtocol import ResponseClearWatch, ResponseClearBreak, ResponseLine, \
+    ResponseSyntax, ResponseException

 gRecursionLimit = 64
--- a/DebugClients/Python/DebugClient.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/DebugClients/Python/DebugClient.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a Qt free version of the debug client.
 """

-from AsyncIO import *
-from DebugBase import *
+from AsyncIO import AsyncIO
+from DebugBase import DebugBase
 import DebugClientBase
--- a/DebugClients/Python/DebugClientBase.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/DebugClients/Python/DebugClientBase.py	Sun Jun 05 18:25:36 2011 +0200
@@ -18,10 +18,10 @@
 import re


-from DebugProtocol import *
+import DebugProtocol
 import DebugClientCapabilities
 from DebugBase import setRecursionLimit, printerr   # __IGNORE_WARNING__
-from AsyncFile import *
+from AsyncFile import AsyncFile, AsyncPendingWrite
 from DebugConfig import ConfigVarTypeStrings
 from FlexCompleter import Completer

@@ -206,7 +206,7 @@
         self.globalsFilterObjects = []
         self.localsFilterObjects = []

-        self.pendingResponse = ResponseOK
+        self.pendingResponse = DebugProtocol.ResponseOK
         self.fncache = {}
         self.dircache = []
         self.inRawMode = 0
@@ -318,7 +318,8 @@
             d["broken"] = self.isBroken()
             threadList.append(d)

-        self.write('%s%s\n' % (ResponseThreadList, unicode((currentId, threadList))))
+        self.write('%s%s\n' % (DebugProtocol.ResponseThreadList,
+                               unicode((currentId, threadList))))

     def raw_input(self, prompt, echo):
         """
@@ -328,7 +329,7 @@
         @param echo Flag indicating echoing of the input (boolean)
         @return the entered string
         """
-        self.write("%s%s\n" % (ResponseRaw, unicode((prompt, echo))))
+        self.write("%s%s\n" % (DebugProtocol.ResponseRaw, unicode((prompt, echo))))
         self.inRawMode = 1
         self.eventLoop(True)
         return self.rawLine
@@ -348,7 +349,7 @@

         It ensures that the debug server is informed of the raised exception.
         """
-        self.pendingResponse = ResponseException
+        self.pendingResponse = DebugProtocol.ResponseException

     def sessionClose(self, exit=1):
         """
@@ -398,45 +399,45 @@
             cmd = line[:eoc + 1]
             arg = line[eoc + 1:]

-            if cmd == RequestVariables:
+            if cmd == DebugProtocol.RequestVariables:
                 frmnr, scope, filter = eval(arg)
                 self.__dumpVariables(int(frmnr), int(scope), filter)
                 return

-            if cmd == RequestVariable:
+            if cmd == DebugProtocol.RequestVariable:
                 var, frmnr, scope, filter = eval(arg)
                 self.__dumpVariable(var, int(frmnr), int(scope), filter)
                 return

-            if cmd == RequestThreadList:
+            if cmd == DebugProtocol.RequestThreadList:
                 self.__dumpThreadList()
                 return

-            if cmd == RequestThreadSet:
+            if cmd == DebugProtocol.RequestThreadSet:
                 tid = eval(arg)
                 if tid in self.threads:
                     self.setCurrentThread(tid)
-                    self.write(ResponseThreadSet + '\n')
+                    self.write(DebugProtocol.ResponseThreadSet + '\n')
                     stack = self.currentThread.getStack()
-                    self.write('%s%s\n' % (ResponseStack, unicode(stack)))
+                    self.write('%s%s\n' % (DebugProtocol.ResponseStack, unicode(stack)))
                 return

-            if cmd == RequestStep:
+            if cmd == DebugProtocol.RequestStep:
                 self.currentThread.step(1)
                 self.eventExit = 1
                 return

-            if cmd == RequestStepOver:
+            if cmd == DebugProtocol.RequestStepOver:
                 self.currentThread.step(0)
                 self.eventExit = 1
                 return

-            if cmd == RequestStepOut:
+            if cmd == DebugProtocol.RequestStepOut:
                 self.currentThread.stepOut()
                 self.eventExit = 1
                 return

-            if cmd == RequestStepQuit:
+            if cmd == DebugProtocol.RequestStepQuit:
                 if self.passive:
                     self.progTerminated(42)
                 else:
@@ -444,18 +445,18 @@
                     self.eventExit = 1
                 return

-            if cmd == RequestContinue:
+            if cmd == DebugProtocol.RequestContinue:
                 special = int(arg)
                 self.currentThread.go(special)
                 self.eventExit = 1
                 return

-            if cmd == RequestOK:
+            if cmd == DebugProtocol.RequestOK:
                 self.write(self.pendingResponse + '\n')
-                self.pendingResponse = ResponseOK
+                self.pendingResponse = DebugProtocol.ResponseOK
                 return

-            if cmd == RequestEnv:
+            if cmd == DebugProtocol.RequestEnv:
                 env = eval(arg)
                 for key, value in env.items():
                     if key.endswith("+"):
@@ -467,7 +468,7 @@
                         os.environ[key] = value
                 return

-            if cmd == RequestLoad:
+            if cmd == DebugProtocol.RequestLoad:
                 self.fncache = {}
                 self.dircache = []
                 sys.argv = []
@@ -510,7 +511,7 @@
                 self.progTerminated(res)
                 return

-            if cmd == RequestRun:
+            if cmd == DebugProtocol.RequestRun:
                 sys.argv = []
                 wd, fn, args = arg.split('|')
                 self.__setCoding(fn)
@@ -542,7 +543,7 @@
                 self.writestream.flush()
                 return

-            if cmd == RequestCoverage:
+            if cmd == DebugProtocol.RequestCoverage:
                 from coverage import coverage
                 sys.argv = []
                 wd, fn, args, erase = arg.split('@@')
@@ -575,7 +576,7 @@
                 self.writestream.flush()
                 return

-            if cmd == RequestProfile:
+            if cmd == DebugProtocol.RequestProfile:
                 sys.setprofile(None)
                 import PyProfile
                 sys.argv = []
@@ -605,11 +606,11 @@
                 self.writestream.flush()
                 return

-            if cmd == RequestShutdown:
+            if cmd == DebugProtocol.RequestShutdown:
                 self.sessionClose()
                 return

-            if cmd == RequestBreak:
+            if cmd == DebugProtocol.RequestBreak:
                 fn, line, temporary, set, cond = arg.split('@@')
                 line = int(line)
                 set = int(set)
@@ -623,7 +624,7 @@
                             compile(cond, '<string>', 'eval')
                         except SyntaxError:
                             self.write('%s%s,%d\n' % \
-                                (ResponseBPConditionError, fn, line))
+                                (DebugProtocol.ResponseBPConditionError, fn, line))
                             return
                     self.mainThread.set_break(fn, line, temporary, cond)
                 else:
@@ -631,7 +632,7 @@

                 return

-            if cmd == RequestBreakEnable:
+            if cmd == DebugProtocol.RequestBreakEnable:
                 fn, line, enable = arg.split(',')
                 line = int(line)
                 enable = int(enable)
@@ -645,7 +646,7 @@

                 return

-            if cmd == RequestBreakIgnore:
+            if cmd == DebugProtocol.RequestBreakIgnore:
                 fn, line, count = arg.split(',')
                 line = int(line)
                 count = int(count)
@@ -656,7 +657,7 @@

                 return

-            if cmd == RequestWatch:
+            if cmd == DebugProtocol.RequestWatch:
                 cond, temporary, set = arg.split('@@')
                 set = int(set)
                 temporary = int(temporary)
@@ -667,7 +668,8 @@
                         try:
                             compile(cond, '<string>', 'eval')
                         except SyntaxError:
-                            self.write('%s%s\n' % (ResponseWPConditionError, cond))
+                            self.write('%s%s\n' % (
+                                DebugProtocol.ResponseWPConditionError, cond))
                             return
                     self.mainThread.set_watch(cond, temporary)
                 else:
@@ -675,7 +677,7 @@

                 return

-            if cmd == RequestWatchEnable:
+            if cmd == DebugProtocol.RequestWatchEnable:
                 cond, enable = arg.split(',')
                 enable = int(enable)

@@ -688,7 +690,7 @@

                 return

-            if cmd == RequestWatchIgnore:
+            if cmd == DebugProtocol.RequestWatchIgnore:
                 cond, count = arg.split(',')
                 count = int(count)

@@ -698,7 +700,7 @@

                 return

-            if cmd == RequestEval:
+            if cmd == DebugProtocol.RequestEval:
                 try:
                     value = eval(arg, self.currentThread.getCurrentFrame().f_globals,
                                       self.currentThread.getCurrentFrameLocals())
@@ -721,15 +723,15 @@

                     map(self.write, list)

-                    self.write(ResponseException + '\n')
+                    self.write(DebugProtocol.ResponseException + '\n')

                 else:
                     self.write(unicode(value) + '\n')
-                    self.write(ResponseOK + '\n')
+                    self.write(DebugProtocol.ResponseOK + '\n')

                 return

-            if cmd == RequestExec:
+            if cmd == DebugProtocol.RequestExec:
                 _globals = self.currentThread.getCurrentFrame().f_globals
                 _locals = self.currentThread.getCurrentFrameLocals()
                 try:
@@ -754,31 +756,31 @@

                     map(self.write, list)

-                    self.write(ResponseException + '\n')
+                    self.write(DebugProtocol.ResponseException + '\n')

                 return

-            if cmd == RequestBanner:
-                self.write('%s%s\n' % (ResponseBanner,
+            if cmd == DebugProtocol.RequestBanner:
+                self.write('%s%s\n' % (DebugProtocol.ResponseBanner,
                     unicode(("Python %s" % sys.version, socket.gethostname(),
                              self.variant))))
                 return

-            if cmd == RequestCapabilities:
-                self.write('%s%d, "Python"\n' % (ResponseCapabilities,
+            if cmd == DebugProtocol.RequestCapabilities:
+                self.write('%s%d, "Python"\n' % (DebugProtocol.ResponseCapabilities,
                     self.__clientCapabilities()))
                 return

-            if cmd == RequestCompletion:
+            if cmd == DebugProtocol.RequestCompletion:
                 self.__completionList(arg)
                 return

-            if cmd == RequestSetFilter:
+            if cmd == DebugProtocol.RequestSetFilter:
                 scope, filterString = eval(arg)
                 self.__generateFilterObjects(int(scope), filterString)
                 return

-            if cmd == RequestUTPrepare:
+            if cmd == DebugProtocol.RequestUTPrepare:
                 fn, tn, tfn, cov, covname, erase = arg.split('|')
                 sys.path.insert(0, os.path.dirname(os.path.abspath(fn)))
                 os.chdir(sys.path[0])
@@ -798,7 +800,7 @@
                                     .loadTestsFromModule(utModule)
                 except:
                     exc_type, exc_value, exc_tb = sys.exc_info()
-                    self.write('%s%s\n' % (ResponseUTPrepared,
+                    self.write('%s%s\n' % (DebugProtocol.ResponseUTPrepared,
                         unicode((0, str(exc_type), str(exc_value)))))
                     self.__exceptionRaised()
                     return
@@ -814,11 +816,11 @@
                 else:
                     self.cover = None

-                self.write('%s%s\n' % (ResponseUTPrepared,
+                self.write('%s%s\n' % (DebugProtocol.ResponseUTPrepared,
                     unicode((self.test.countTestCases(), "", ""))))
                 return

-            if cmd == RequestUTRun:
+            if cmd == DebugProtocol.RequestUTRun:
                 from DCTestResult import DCTestResult
                 self.testResult = DCTestResult(self)
                 if self.cover:
@@ -827,20 +829,20 @@
                 if self.cover:
                     self.cover.stop()
                     self.cover.save()
-                self.write('%s\n' % ResponseUTFinished)
+                self.write('%s\n' % DebugProtocol.ResponseUTFinished)
                 return

-            if cmd == RequestUTStop:
+            if cmd == DebugProtocol.RequestUTStop:
                 self.testResult.stop()
                 return

-            if cmd == ResponseForkTo:
+            if cmd == DebugProtocol.ResponseForkTo:
                 # this results from a separate event loop
                 self.fork_child = (arg == 'child')
                 self.eventExit = 1
                 return

-            if cmd == RequestForkMode:
+            if cmd == DebugProtocol.RequestForkMode:
                 self.fork_auto, self.fork_child = eval(arg)
                 return

@@ -868,7 +870,7 @@
             self.__exceptionRaised()
         else:
             if code is None:
-                self.pendingResponse = ResponseContinue
+                self.pendingResponse = DebugProtocol.ResponseContinue
             else:
                 self.buffer = ''

@@ -1058,7 +1060,7 @@
         """
         if remoteAddress is None:                               # default: 127.0.0.1
             sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            sock.connect((DebugAddress, port))
+            sock.connect((DebugProtocol.DebugAddress, port))
         elif ":" in remoteAddress:                              # IPv6
             sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
             sock.connect((remoteAddress, port))
@@ -1171,7 +1173,7 @@
         if self.running:
             self.set_quit()
             self.running = None
-            self.write('%s%d\n' % (ResponseExit, status))
+            self.write('%s%d\n' % (DebugProtocol.ResponseExit, status))

         # reset coding
         self.__coding = self.defaultCoding
@@ -1212,7 +1214,7 @@
             vlist = self.__formatVariablesList(keylist, dict, scope, filter)
             varlist.extend(vlist)

-        self.write('%s%s\n' % (ResponseVariables, unicode(varlist)))
+        self.write('%s%s\n' % (DebugProtocol.ResponseVariables, unicode(varlist)))

     def __dumpVariable(self, var, frmnr, scope, filter):
         """
@@ -1317,9 +1319,9 @@
                             oaccess = ''
                         try:
                             exec 'mdict = dict%s.__dict__' % access
-                            ndict.update(mdict)
+                            ndict.update(mdict)     # __IGNORE_WARNING__
                             exec 'obj = dict%s' % access
-                            if mdict and not "sipThis" in mdict.keys():
+                            if mdict and not "sipThis" in mdict.keys(): # __IGNORE_WARNING__
                                 del rvar[0:2]
                                 access = ""
                         except:
@@ -1327,7 +1329,7 @@
                         try:
                             cdict = {}
                             exec 'slv = dict%s.__slots__' % access
-                            for v in slv:
+                            for v in slv:   # __IGNORE_WARNING__
                                 try:
                                     exec 'cdict[v] = dict%s.%s' % (access, v)
                                 except:
@@ -1400,7 +1402,7 @@
                 elif unicode(repr(obj)).startswith('('):
                     varlist.append(('...', 'tuple', "%d" % len(obj)))

-        self.write('%s%s\n' % (ResponseVariable, unicode(varlist)))
+        self.write('%s%s\n' % (DebugProtocol.ResponseVariable, unicode(varlist)))

     def __formatQt4Variable(self, value, vtype):
         """
@@ -1660,7 +1662,8 @@
             except:
                 comp = None

-        self.write("%s%s||%s\n" % (ResponseCompletion, unicode(completions), text))
+        self.write("%s%s||%s\n" % (DebugProtocol.ResponseCompletion,
+                                   unicode(completions), text))

     def startDebugger(self, filename=None, host=None, port=None,
             enableTrace=1, exceptions=1, tracePython=0, redirect=1):
@@ -1693,7 +1696,7 @@
         if self.running:
             self.__setCoding(self.running)
         self.passive = 1
-        self.write("%s%s|%d\n" % (PassiveStartup, self.running, exceptions))
+        self.write("%s%s|%d\n" % (DebugProtocol.PassiveStartup, self.running, exceptions))
         self.__interact()

         # setup the debugger variables
@@ -1752,7 +1755,7 @@
         self.debugging = 1

         self.passive = 1
-        self.write("%s%s|%d\n" % (PassiveStartup, self.running, exceptions))
+        self.write("%s%s|%d\n" % (DebugProtocol.PassiveStartup, self.running, exceptions))
         self.__interact()

         self.attachThread(mainThread=1)
@@ -1902,7 +1905,7 @@
         Public method implementing a fork routine deciding which branch to follow.
         """
         if not self.fork_auto:
-            self.write(RequestForkTo + '\n')
+            self.write(DebugProtocol.RequestForkTo + '\n')
             self.eventLoop(True)
         pid = DebugClientOrigFork()
         if pid == 0:
--- a/DebugClients/Python/DebugClientThreads.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/DebugClients/Python/DebugClientThreads.py	Sun Jun 05 18:25:36 2011 +0200
@@ -8,10 +8,10 @@
 """

 import thread
+import sys

-from AsyncIO import *
-from DebugThread import *
-from DebugBase import *
+from AsyncIO import AsyncIO
+from DebugThread import DebugThread
 import DebugClientBase
--- a/DebugClients/Python/DebugThread.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/DebugClients/Python/DebugThread.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,7 +10,7 @@
 import bdb
 import sys

-from DebugBase import *
+from DebugBase import DebugBase


 class DebugThread(DebugBase):
--- a/DebugClients/Python3/DCTestResult.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/DebugClients/Python3/DCTestResult.py	Sun Jun 05 18:25:36 2011 +0200
@@ -12,7 +12,8 @@
 from unittest import TestResult


-from DebugProtocol import *
+from DebugProtocol import ResponseUTTestFailed, ResponseUTTestErrored, \
+    ResponseUTStartTest, ResponseUTStopTest


 class DCTestResult(TestResult):
--- a/DebugClients/Python3/DebugBase.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/DebugClients/Python3/DebugBase.py	Sun Jun 05 18:25:36 2011 +0200
@@ -13,7 +13,8 @@
 import atexit
 import inspect

-from DebugProtocol import *
+from DebugProtocol import ResponseClearWatch, ResponseClearBreak, ResponseLine, \
+    ResponseSyntax, ResponseException

 gRecursionLimit = 64
--- a/DebugClients/Python3/DebugClient.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/DebugClients/Python3/DebugClient.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a non-threaded variant of the debug client.
 """

-from AsyncIO import *
-from DebugBase import *
+from AsyncIO import AsyncIO
+from DebugBase import DebugBase
 import DebugClientBase
--- a/DebugClients/Python3/DebugClientBase.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/DebugClients/Python3/DebugClientBase.py	Sun Jun 05 18:25:36 2011 +0200
@@ -18,10 +18,10 @@
 import re


-from DebugProtocol import *
+import DebugProtocol
 import DebugClientCapabilities
 from DebugBase import setRecursionLimit, printerr   # __IGNORE_WARNING__
-from AsyncFile import *
+from AsyncFile import AsyncFile, AsyncPendingWrite
 from DebugConfig import ConfigVarTypeStrings
 from FlexCompleter import Completer

@@ -180,7 +180,7 @@
         self.globalsFilterObjects = []
         self.localsFilterObjects = []

-        self.pendingResponse = ResponseOK
+        self.pendingResponse = DebugProtocol.ResponseOK
         self.fncache = {}
         self.dircache = []
         self.inRawMode = False
@@ -286,7 +286,8 @@
             d["broken"] = self.isBroken()
             threadList.append(d)

-        self.write("{0}{1!r}\n".format(ResponseThreadList, (currentId, threadList)))
+        self.write("{0}{1!r}\n".format(DebugProtocol.ResponseThreadList,
+                                       (currentId, threadList)))

     def input(self, prompt, echo=True):
         """
@@ -296,7 +297,7 @@
         @param echo Flag indicating echoing of the input (boolean)
         @return the entered string
         """
-        self.write("{0}{1!r}\n".format(ResponseRaw, (prompt, echo)))
+        self.write("{0}{1!r}\n".format(DebugProtocol.ResponseRaw, (prompt, echo)))
         self.inRawMode = True
         self.eventLoop(True)
         return self.rawLine
@@ -307,7 +308,7 @@

         It ensures that the debug server is informed of the raised exception.
         """
-        self.pendingResponse = ResponseException
+        self.pendingResponse = DebugProtocol.ResponseException

     def sessionClose(self, exit=True):
         """
@@ -357,7 +358,7 @@
             else:
                 exclist = [message, [filename, linenr, charnr]]

-            self.write("{0}{1}\n".format(ResponseSyntax, str(exclist)))
+            self.write("{0}{1}\n".format(DebugProtocol.ResponseSyntax, str(exclist)))
             return None

         return code
@@ -384,45 +385,45 @@
             cmd = line[:eoc + 1]
             arg = line[eoc + 1:]

-            if cmd == RequestVariables:
+            if cmd == DebugProtocol.RequestVariables:
                 frmnr, scope, filter = eval(arg.replace("u'", "'"))
                 self.__dumpVariables(int(frmnr), int(scope), filter)
                 return

-            if cmd == RequestVariable:
+            if cmd == DebugProtocol.RequestVariable:
                 var, frmnr, scope, filter = eval(arg.replace("u'", "'"))
                 self.__dumpVariable(var, int(frmnr), int(scope), filter)
                 return

-            if cmd == RequestThreadList:
+            if cmd == DebugProtocol.RequestThreadList:
                 self.__dumpThreadList()
                 return

-            if cmd == RequestThreadSet:
+            if cmd == DebugProtocol.RequestThreadSet:
                 tid = eval(arg)
                 if tid in self.threads:
                     self.setCurrentThread(tid)
-                    self.write(ResponseThreadSet + '\n')
+                    self.write(DebugProtocol.ResponseThreadSet + '\n')
                     stack = self.currentThread.getStack()
-                    self.write('{0}{1!r}\n'.format(ResponseStack, stack))
+                    self.write('{0}{1!r}\n'.format(DebugProtocol.ResponseStack, stack))
                 return

-            if cmd == RequestStep:
+            if cmd == DebugProtocol.RequestStep:
                 self.currentThread.step(True)
                 self.eventExit = True
                 return

-            if cmd == RequestStepOver:
+            if cmd == DebugProtocol.RequestStepOver:
                 self.currentThread.step(False)
                 self.eventExit = True
                 return

-            if cmd == RequestStepOut:
+            if cmd == DebugProtocol.RequestStepOut:
                 self.currentThread.stepOut()
                 self.eventExit = True
                 return

-            if cmd == RequestStepQuit:
+            if cmd == DebugProtocol.RequestStepQuit:
                 if self.passive:
                     self.progTerminated(42)
                 else:
@@ -430,18 +431,18 @@
                     self.eventExit = True
                 return

-            if cmd == RequestContinue:
+            if cmd == DebugProtocol.RequestContinue:
                 special = int(arg)
                 self.currentThread.go(special)
                 self.eventExit = True
                 return

-            if cmd == RequestOK:
+            if cmd == DebugProtocol.RequestOK:
                 self.write(self.pendingResponse + '\n')
-                self.pendingResponse = ResponseOK
+                self.pendingResponse = DebugProtocol.ResponseOK
                 return

-            if cmd == RequestEnv:
+            if cmd == DebugProtocol.RequestEnv:
                 env = eval(arg.replace("u'", "'"))
                 for key, value in env.items():
                     if key.endswith("+"):
@@ -453,7 +454,7 @@
                         os.environ[key] = value
                 return

-            if cmd == RequestLoad:
+            if cmd == DebugProtocol.RequestLoad:
                 self.fncache = {}
                 self.dircache = []
                 sys.argv = []
@@ -497,7 +498,7 @@
                     self.progTerminated(res)
                 return

-            if cmd == RequestRun:
+            if cmd == DebugProtocol.RequestRun:
                 sys.argv = []
                 wd, fn, args = arg.split('|')
                 self.__setCoding(fn)
@@ -530,7 +531,7 @@
                 self.writestream.flush()
                 return

-            if cmd == RequestProfile:
+            if cmd == DebugProtocol.RequestProfile:
                 sys.setprofile(None)
                 import PyProfile
                 sys.argv = []
@@ -566,7 +567,7 @@
                     self.writestream.flush()
                 return

-            if cmd == RequestCoverage:
+            if cmd == DebugProtocol.RequestCoverage:
                 from coverage import coverage
                 sys.argv = []
                 wd, fn, args, erase = arg.split('@@')
@@ -600,11 +601,11 @@
                 self.writestream.flush()
                 return

-            if cmd == RequestShutdown:
+            if cmd == DebugProtocol.RequestShutdown:
                 self.sessionClose()
                 return

-            if cmd == RequestBreak:
+            if cmd == DebugProtocol.RequestBreak:
                 fn, line, temporary, set, cond = arg.split('@@')
                 line = int(line)
                 set = int(set)
@@ -618,7 +619,7 @@
                             compile(cond, '<string>', 'eval')
                         except SyntaxError:
                             self.write('{0}{1},{2:d}\n'.format(
-                                       ResponseBPConditionError, fn, line))
+                                       DebugProtocol.ResponseBPConditionError, fn, line))
                             return
                     self.mainThread.set_break(fn, line, temporary, cond)
                 else:
@@ -626,7 +627,7 @@

                 return

-            if cmd == RequestBreakEnable:
+            if cmd == DebugProtocol.RequestBreakEnable:
                 fn, line, enable = arg.split(',')
                 line = int(line)
                 enable = int(enable)
@@ -640,7 +641,7 @@

                 return

-            if cmd == RequestBreakIgnore:
+            if cmd == DebugProtocol.RequestBreakIgnore:
                 fn, line, count = arg.split(',')
                 line = int(line)
                 count = int(count)
@@ -651,7 +652,7 @@

                 return

-            if cmd == RequestWatch:
+            if cmd == DebugProtocol.RequestWatch:
                 cond, temporary, set = arg.split('@@')
                 set = int(set)
                 temporary = int(temporary)
@@ -662,7 +663,8 @@
                         try:
                             compile(cond, '<string>', 'eval')
                         except SyntaxError:
-                            self.write('{0}{1}\n'.format(ResponseWPConditionError, cond))
+                            self.write('{0}{1}\n'.format(
+                                DebugProtocol.ResponseWPConditionError, cond))
                             return
                     self.mainThread.set_watch(cond, temporary)
                 else:
@@ -670,7 +672,7 @@

                 return

-            if cmd == RequestWatchEnable:
+            if cmd == DebugProtocol.RequestWatchEnable:
                 cond, enable = arg.split(',')
                 enable = int(enable)

@@ -683,7 +685,7 @@

                 return

-            if cmd == RequestWatchIgnore:
+            if cmd == DebugProtocol.RequestWatchIgnore:
                 cond, count = arg.split(',')
                 count = int(count)

@@ -693,7 +695,7 @@

                 return

-            if cmd == RequestEval:
+            if cmd == DebugProtocol.RequestEval:
                 try:
                     value = eval(arg, self.currentThread.getCurrentFrame().f_globals,
                                       self.currentThread.getCurrentFrameLocals())
@@ -717,15 +719,15 @@
                     for l in list:
                         self.write(l)

-                    self.write(ResponseException + '\n')
+                    self.write(DebugProtocol.ResponseException + '\n')

                 else:
                     self.write(str(value) + '\n')
-                    self.write(ResponseOK + '\n')
+                    self.write(DebugProtocol.ResponseOK + '\n')

                 return

-            if cmd == RequestExec:
+            if cmd == DebugProtocol.RequestExec:
                 _globals = self.currentThread.getCurrentFrame().f_globals
                 _locals = self.currentThread.getCurrentFrameLocals()
                 try:
@@ -751,31 +753,32 @@
                     for l in list:
                         self.write(l)

-                    self.write(ResponseException + '\n')
+                    self.write(DebugProtocol.ResponseException + '\n')

                 return

-            if cmd == RequestBanner:
-                self.write('{0}{1}\n'.format(ResponseBanner,
+            if cmd == DebugProtocol.RequestBanner:
+                self.write('{0}{1}\n'.format(DebugProtocol.ResponseBanner,
                     str(("Python {0}".format(sys.version),
                          socket.gethostname(), self.variant))))
                 return

-            if cmd == RequestCapabilities:
-                self.write('{0}{1:d}, "Python3"\n'.format(ResponseCapabilities,
+            if cmd == DebugProtocol.RequestCapabilities:
+                self.write('{0}{1:d}, "Python3"\n'.format(
+                    DebugProtocol.ResponseCapabilities,
                     self.__clientCapabilities()))
                 return

-            if cmd == RequestCompletion:
+            if cmd == DebugProtocol.RequestCompletion:
                 self.__completionList(arg.replace("u'", "'"))
                 return

-            if cmd == RequestSetFilter:
+            if cmd == DebugProtocol.RequestSetFilter:
                 scope, filterString = eval(arg.replace("u'", "'"))
                 self.__generateFilterObjects(int(scope), filterString)
                 return

-            if cmd == RequestUTPrepare:
+            if cmd == DebugProtocol.RequestUTPrepare:
                 fn, tn, tfn, cov, covname, erase = arg.split('|')
                 sys.path.insert(0, os.path.dirname(os.path.abspath(fn)))
                 os.chdir(sys.path[0])
@@ -795,7 +798,7 @@
                                     .loadTestsFromModule(utModule)
                 except:
                     exc_type, exc_value, exc_tb = sys.exc_info()
-                    self.write('{0}{1}\n'.format(ResponseUTPrepared,
+                    self.write('{0}{1}\n'.format(DebugProtocol.ResponseUTPrepared,
                         str((0, str(exc_type), str(exc_value)))))
                     self.__exceptionRaised()
                     return
@@ -811,11 +814,11 @@
                 else:
                     self.cover = None

-                self.write('{0}{1}\n'.format(ResponseUTPrepared,
+                self.write('{0}{1}\n'.format(DebugProtocol.ResponseUTPrepared,
                     str((self.test.countTestCases(), "", ""))))
                 return

-            if cmd == RequestUTRun:
+            if cmd == DebugProtocol.RequestUTRun:
                 from DCTestResult import DCTestResult
                 self.testResult = DCTestResult(self)
                 if self.cover:
@@ -824,20 +827,20 @@
                 if self.cover:
                     self.cover.stop()
                     self.cover.save()
-                self.write('{0}\n'.format(ResponseUTFinished))
+                self.write('{0}\n'.format(DebugProtocol.ResponseUTFinished))
                 return

-            if cmd == RequestUTStop:
+            if cmd == DebugProtocol.RequestUTStop:
                 self.testResult.stop()
                 return

-            if cmd == ResponseForkTo:
+            if cmd == DebugProtocol.ResponseForkTo:
                 # this results from a separate event loop
                 self.fork_child = (arg == 'child')
                 self.eventExit = True
                 return

-            if cmd == RequestForkMode:
+            if cmd == DebugProtocol.RequestForkMode:
                 self.fork_auto, self.fork_child = eval(arg)
                 return

@@ -866,7 +869,7 @@
             self.__exceptionRaised()
         else:
             if code is None:
-                self.pendingResponse = ResponseContinue
+                self.pendingResponse = DebugProtocol.ResponseContinue
             else:
                 self.buffer = ''

@@ -1057,7 +1060,7 @@
         """
         if remoteAddress is None:                               # default: 127.0.0.1
             sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            sock.connect((DebugAddress, port))
+            sock.connect((DebugProtocol.DebugAddress, port))
         elif ":" in remoteAddress:                              # IPv6
             sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
             sock.connect((remoteAddress, port))
@@ -1170,7 +1173,7 @@
         if self.running:
             self.set_quit()
             self.running = None
-            self.write('{0}{1:d}\n'.format(ResponseExit, status))
+            self.write('{0}{1:d}\n'.format(DebugProtocol.ResponseExit, status))

         # reset coding
         self.__coding = self.defaultCoding
@@ -1211,7 +1214,7 @@
             vlist = self.__formatVariablesList(keylist, dict, scope, filter)
             varlist.extend(vlist)

-        self.write('{0}{1}\n'.format(ResponseVariables, str(varlist)))
+        self.write('{0}{1}\n'.format(DebugProtocol.ResponseVariables, str(varlist)))

     def __dumpVariable(self, var, frmnr, scope, filter):
         """
@@ -1415,7 +1418,7 @@
                 elif repr(obj).startswith('('):
                     varlist.append(('...', 'tuple', "{0:d}".format(len(obj))))

-        self.write('{0}{1}\n'.format(ResponseVariable, str(varlist)))
+        self.write('{0}{1}\n'.format(DebugProtocol.ResponseVariable, str(varlist)))

     def __formatQt4Variable(self, value, vtype):
         """
@@ -1680,7 +1683,8 @@
             except:
                 comp = None

-        self.write("{0}{1}||{2}\n".format(ResponseCompletion, str(completions), text))
+        self.write("{0}{1}||{2}\n".format(DebugProtocol.ResponseCompletion,
+                                          str(completions), text))

     def startDebugger(self, filename=None, host=None, port=None,
             enableTrace=True, exceptions=True, tracePython=False, redirect=True):
@@ -1713,7 +1717,8 @@
         if self.running:
             self.__setCoding(self.running)
         self.passive = True
-        self.write("{0}{1}|{2:d}\n".format(PassiveStartup, self.running, exceptions))
+        self.write("{0}{1}|{2:d}\n".format(DebugProtocol.PassiveStartup,
+                                           self.running, exceptions))
         self.__interact()

         # setup the debugger variables
@@ -1772,7 +1777,8 @@
         self.debugging = True

         self.passive = True
-        self.write("{0}{1}|{2:d}\n".format(PassiveStartup, self.running, exceptions))
+        self.write("{0}{1}|{2:d}\n".format(
+            DebugProtocol.PassiveStartup, self.running, exceptions))
         self.__interact()

         self.attachThread(mainThread=True)
@@ -1923,7 +1929,7 @@
         Public method implementing a fork routine deciding which branch to follow.
         """
         if not self.fork_auto:
-            self.write(RequestForkTo + '\n')
+            self.write(DebugProtocol.RequestForkTo + '\n')
             self.eventLoop(True)
         pid = DebugClientOrigFork()
         if pid == 0:
--- a/DebugClients/Python3/DebugClientThreads.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/DebugClients/Python3/DebugClientThreads.py	Sun Jun 05 18:25:36 2011 +0200
@@ -8,10 +8,10 @@
 """

 import _thread
+import sys

-from AsyncIO import *
-from DebugThread import *
-from DebugBase import *
+from AsyncIO import AsyncIO
+from DebugThread import DebugThread
 import DebugClientBase
--- a/DebugClients/Python3/DebugThread.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/DebugClients/Python3/DebugThread.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,7 +10,7 @@
 import bdb
 import sys

-from DebugBase import *
+from DebugBase import DebugBase


 class DebugThread(DebugBase):
--- a/Debugger/BreakPointModel.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/BreakPointModel.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,7 @@
 Module implementing the Breakpoint model.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex, QObject


 class BreakPointModel(QAbstractItemModel):
--- a/Debugger/BreakPointViewer.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/BreakPointViewer.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,9 @@
 Module implementing the Breakpoint viewer widget.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt
+from PyQt4.QtGui import QTreeView, QAbstractItemView, QSortFilterProxyModel, \
+    QHeaderView, QItemSelectionModel, QMenu, QDialog

 from E5Gui.E5Application import e5App
--- a/Debugger/DebugServer.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/DebugServer.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSignal, QModelIndex
 from PyQt4.QtNetwork import QTcpServer, QHostAddress, QHostInfo

 from E5Gui.E5Application import e5App
@@ -625,7 +625,7 @@
                 if value.startswith('"') or value.startswith("'"):
                     value = value[1:-1]
                 envdict[key] = value
-            except UnpackError:
+            except ValueError:
                 pass
         self.debuggerInterface.remoteEnvironment(envdict)
--- a/Debugger/DebugUI.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/DebugUI.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,16 +9,19 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, QObject, Qt
+from PyQt4.QtGui import QKeySequence, QMenu, QToolBar, QApplication, QDialog, \
+    QInputDialog

-from UI.Info import *
-from .VariablesFilterDialog import *
-from .ExceptionsFilterDialog import *
-from .StartDialog import *
+from UI.Info import Program
+from .VariablesFilterDialog import VariablesFilterDialog
+from .ExceptionsFilterDialog import ExceptionsFilterDialog
+from .StartDialog import StartDialog
 from .EditBreakpointDialog import EditBreakpointDialog
+from .EditWatchpointDialog import EditWatchpointDialog

-from .DebugClientCapabilities import *
+from .DebugClientCapabilities import HasDebugger, HasInterpreter, HasProfiler, \
+    HasCoverage
 import Preferences
 import Utilities
 import UI.PixmapCache
--- a/Debugger/DebugViewer.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/DebugViewer.py	Sun Jun 05 18:25:36 2011 +0200
@@ -21,8 +21,9 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal
+from PyQt4.QtGui import QWidget, QVBoxLayout, QHBoxLayout, QLineEdit, QSizePolicy, \
+    QPushButton, QComboBox, QLabel, QTreeWidget, QTreeWidgetItem, QHeaderView

 from QScintilla.Shell import Shell
 from .VariablesViewer import VariablesViewer
--- a/Debugger/DebuggerInterfaceNone.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/DebuggerInterfaceNone.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,7 @@
 Module implementing a dummy debugger interface for the debug server.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import QObject


 ClientDefaultCapabilities = 0
--- a/Debugger/DebuggerInterfacePython.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/DebuggerInterfacePython.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,13 +11,13 @@
 import os
 import re

-from PyQt4.QtCore import *
+from PyQt4.QtCore import QObject, QTextCodec, QProcess, QTimer
 from PyQt4.QtGui import QInputDialog

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox

-from .DebugProtocol import *
+from . import DebugProtocol
 from . import DebugClientCapabilities

 import Preferences
@@ -218,7 +218,7 @@
                 if value.startswith('"') or value.startswith("'"):
                     value = value[1:-1]
                 clientEnv[str(key)] = str(value)
-            except UnpackError:
+            except ValueError:
                 pass

         ipaddr = self.debugServer.getHostAddress(True)
@@ -310,7 +310,7 @@
                 if value.startswith('"') or value.startswith("'"):
                     value = value[1:-1]
                 clientEnv[str(key)] = str(value)
-            except UnpackError:
+            except ValueError:
                 pass

         ipaddr = self.debugServer.getHostAddress(True)
@@ -393,7 +393,7 @@
         self.qsock.readyRead[()].disconnect(self.__parseClientLine)

         # close down socket, and shut down client as well.
-        self.__sendCommand('{0}\n'.format(RequestShutdown))
+        self.__sendCommand('{0}\n'.format(DebugProtocol.RequestShutdown))
         self.qsock.flush()

         self.qsock.close()
@@ -416,7 +416,7 @@

         @param env environment settings (dictionary)
         """
-        self.__sendCommand('{0}{1}\n'.format(RequestEnv, str(env)))
+        self.__sendCommand('{0}{1}\n'.format(DebugProtocol.RequestEnv, str(env)))

     def remoteLoad(self, fn, argv, wd, traceInterpreter=False, autoContinue=True,
                    autoFork=False, forkChild=False):
@@ -437,9 +437,10 @@

         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
-        self.__sendCommand('{0}{1}\n'.format(RequestForkMode, repr((autoFork, forkChild))))
+        self.__sendCommand('{0}{1}\n'.format(
+            DebugProtocol.RequestForkMode, repr((autoFork, forkChild))))
         self.__sendCommand('{0}{1}|{2}|{3}|{4:d}\n'.format(
-            RequestLoad, wd, fn, str(Utilities.parseOptionString(argv)),
+            DebugProtocol.RequestLoad, wd, fn, str(Utilities.parseOptionString(argv)),
              traceInterpreter))

     def remoteRun(self, fn, argv, wd, autoFork=False, forkChild=False):
@@ -454,9 +455,10 @@
         """
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
-        self.__sendCommand('{0}{1}\n'.format(RequestForkMode, repr((autoFork, forkChild))))
+        self.__sendCommand('{0}{1}\n'.format(
+            DebugProtocol.RequestForkMode, repr((autoFork, forkChild))))
         self.__sendCommand('{0}{1}|{2}|{3}\n'.format(
-            RequestRun, wd, fn, str(Utilities.parseOptionString(argv))))
+            DebugProtocol.RequestRun, wd, fn, str(Utilities.parseOptionString(argv))))

     def remoteCoverage(self, fn, argv, wd, erase=False):
         """
@@ -471,7 +473,7 @@
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('{0}{1}@@{2}@@{3}@@{4:d}\n'.format(
-            RequestCoverage, wd, fn, str(Utilities.parseOptionString(argv)),
+            DebugProtocol.RequestCoverage, wd, fn, str(Utilities.parseOptionString(argv)),
              erase))

     def remoteProfile(self, fn, argv, wd, erase=False):
@@ -486,7 +488,8 @@
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('{0}{1}|{2}|{3}|{4:d}\n'.format(
-            RequestProfile, wd, fn, str(Utilities.parseOptionString(argv)), erase))
+            DebugProtocol.RequestProfile, wd, fn,
+            str(Utilities.parseOptionString(argv)), erase))

     def remoteStatement(self, stmt):
         """
@@ -496,31 +499,31 @@
               should not have a trailing newline.
         """
         self.__sendCommand('{0}\n'.format(stmt))
-        self.__sendCommand(RequestOK + '\n')
+        self.__sendCommand(DebugProtocol.RequestOK + '\n')

     def remoteStep(self):
         """
         Public method to single step the debugged program.
         """
-        self.__sendCommand(RequestStep + '\n')
+        self.__sendCommand(DebugProtocol.RequestStep + '\n')

     def remoteStepOver(self):
         """
         Public method to step over the debugged program.
         """
-        self.__sendCommand(RequestStepOver + '\n')
+        self.__sendCommand(DebugProtocol.RequestStepOver + '\n')

     def remoteStepOut(self):
         """
         Public method to step out the debugged program.
         """
-        self.__sendCommand(RequestStepOut + '\n')
+        self.__sendCommand(DebugProtocol.RequestStepOut + '\n')

     def remoteStepQuit(self):
         """
         Public method to stop the debugged program.
         """
-        self.__sendCommand(RequestStepQuit + '\n')
+        self.__sendCommand(DebugProtocol.RequestStepQuit + '\n')

     def remoteContinue(self, special=False):
         """
@@ -528,7 +531,7 @@

         @param special flag indicating a special continue operation (boolean)
         """
-        self.__sendCommand('{0}{1:d}\n'.format(RequestContinue, special))
+        self.__sendCommand('{0}{1:d}\n'.format(DebugProtocol.RequestContinue, special))

     def remoteBreakpoint(self, fn, line, set, cond=None, temp=False):
         """
@@ -542,7 +545,7 @@
         """
         fn = self.translate(fn, False)
         self.__sendCommand('{0}{1}@@{2:d}@@{3:d}@@{4:d}@@{5}\n'.format(
-                           RequestBreak, fn, line, temp, set, cond))
+                           DebugProtocol.RequestBreak, fn, line, temp, set, cond))

     def remoteBreakpointEnable(self, fn, line, enable):
         """
@@ -554,7 +557,7 @@
         """
         fn = self.translate(fn, False)
         self.__sendCommand('{0}{1},{2:d},{3:d}\n'.format(
-                           RequestBreakEnable, fn, line, enable))
+                           DebugProtocol.RequestBreakEnable, fn, line, enable))

     def remoteBreakpointIgnore(self, fn, line, count):
         """
@@ -566,7 +569,7 @@
         """
         fn = self.translate(fn, False)
         self.__sendCommand('{0}{1},{2:d},{3:d}\n'.format(
-                           RequestBreakIgnore, fn, line, count))
+                           DebugProtocol.RequestBreakIgnore, fn, line, count))

     def remoteWatchpoint(self, cond, set, temp=False):
         """
@@ -577,7 +580,8 @@
         @param temp flag indicating a temporary watch expression (boolean)
         """
         # cond is combination of cond and special (s. watch expression viewer)
-        self.__sendCommand('{0}{1}@@{2:d}@@{3:d}\n'.format(RequestWatch, cond, temp, set))
+        self.__sendCommand('{0}{1}@@{2:d}@@{3:d}\n'.format(
+            DebugProtocol.RequestWatch, cond, temp, set))

     def remoteWatchpointEnable(self, cond, enable):
         """
@@ -587,7 +591,8 @@
         @param enable flag indicating enabling or disabling a watch expression (boolean)
         """
         # cond is combination of cond and special (s. watch expression viewer)
-        self.__sendCommand('{0}{1},{2:d}\n'.format(RequestWatchEnable, cond, enable))
+        self.__sendCommand('{0}{1},{2:d}\n'.format(
+            DebugProtocol.RequestWatchEnable, cond, enable))

     def remoteWatchpointIgnore(self, cond, count):
         """
@@ -597,7 +602,8 @@
         @param count number of occurrences to ignore (int)
         """
         # cond is combination of cond and special (s. watch expression viewer)
-        self.__sendCommand('{0}{1},{2:d}\n'.format(RequestWatchIgnore, cond, count))
+        self.__sendCommand('{0}{1},{2:d}\n'.format(
+            DebugProtocol.RequestWatchIgnore, cond, count))

     def remoteRawInput(self, s):
         """
@@ -611,7 +617,7 @@
         """
         Public method to request the list of threads from the client.
         """
-        self.__sendCommand('{0}\n'.format(RequestThreadList))
+        self.__sendCommand('{0}\n'.format(DebugProtocol.RequestThreadList))

     def remoteSetThread(self, tid):
         """
@@ -619,7 +625,7 @@

         @param tid id of the thread (integer)
         """
-        self.__sendCommand('{0}{1:d}\n'.format(RequestThreadSet, tid))
+        self.__sendCommand('{0}{1:d}\n'.format(DebugProtocol.RequestThreadSet, tid))

     def remoteClientVariables(self, scope, filter, framenr=0):
         """
@@ -630,7 +636,7 @@
         @param framenr framenumber of the variables to retrieve (int)
         """
         self.__sendCommand('{0}{1:d}, {2:d}, {3}\n'.format(
-            RequestVariables, framenr, scope, str(filter)))
+            DebugProtocol.RequestVariables, framenr, scope, str(filter)))

     def remoteClientVariable(self, scope, filter, var, framenr=0):
         """
@@ -642,7 +648,7 @@
         @param framenr framenumber of the variables to retrieve (int)
         """
         self.__sendCommand('{0}{1}, {2:d}, {3:d}, {4}\n'.format(
-            RequestVariable, str(var), framenr, scope, str(filter)))
+            DebugProtocol.RequestVariable, str(var), framenr, scope, str(filter)))

     def remoteClientSetFilter(self, scope, filter):
         """
@@ -651,7 +657,8 @@
         @param scope the scope of the variables (0 = local, 1 = global)
         @param filter regexp string for variable names to filter out (string)
         """
-        self.__sendCommand('{0}{1:d}, "{2}"\n'.format(RequestSetFilter, scope, filter))
+        self.__sendCommand('{0}{1:d}, "{2}"\n'.format(
+            DebugProtocol.RequestSetFilter, scope, filter))

     def remoteEval(self, arg):
         """
@@ -659,7 +666,7 @@

         @param arg the arguments to evaluate (string)
         """
-        self.__sendCommand('{0}{1}\n'.format(RequestEval, arg))
+        self.__sendCommand('{0}{1}\n'.format(DebugProtocol.RequestEval, arg))

     def remoteExec(self, stmt):
         """
@@ -667,19 +674,19 @@

         @param stmt statement to execute (string)
         """
-        self.__sendCommand('{0}{1}\n'.format(RequestExec, stmt))
+        self.__sendCommand('{0}{1}\n'.format(DebugProtocol.RequestExec, stmt))

     def remoteBanner(self):
         """
         Public slot to get the banner info of the remote client.
         """
-        self.__sendCommand(RequestBanner + '\n')
+        self.__sendCommand(DebugProtocol.RequestBanner + '\n')

     def remoteCapabilities(self):
         """
         Public slot to get the debug clients capabilities.
         """
-        self.__sendCommand(RequestCapabilities + '\n')
+        self.__sendCommand(DebugProtocol.RequestCapabilities + '\n')

     def remoteCompletion(self, text):
         """
@@ -688,7 +695,7 @@

         @param text the text to be completed (string)
         """
-        self.__sendCommand("{0}{1}\n".format(RequestCompletion, text))
+        self.__sendCommand("{0}{1}\n".format(DebugProtocol.RequestCompletion, text))

     def remoteUTPrepare(self, fn, tn, tfn, cov, covname, coverase):
         """
@@ -704,19 +711,19 @@
         """
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('{0}{1}|{2}|{3}|{4:d}|{5}|{6:d}\n'.format(
-            RequestUTPrepare, fn, tn, tfn, cov, covname, coverase))
+            DebugProtocol.RequestUTPrepare, fn, tn, tfn, cov, covname, coverase))

     def remoteUTRun(self):
         """
         Public method to start a unittest run.
         """
-        self.__sendCommand('{0}\n'.format(RequestUTRun))
+        self.__sendCommand('{0}\n'.format(DebugProtocol.RequestUTRun))

     def remoteUTStop(self):
         """
         Public method to stop a unittest run.
         """
-        self.__sendCommand('{0}\n'.format(RequestUTStop))
+        self.__sendCommand('{0}\n'.format(DebugProtocol.RequestUTStop))

     def __askForkTo(self):
         """
@@ -730,9 +737,9 @@
             selections,
             0, False)
         if not ok or res == selections[0]:
-            self.__sendCommand(ResponseForkTo + 'parent\n')
+            self.__sendCommand(DebugProtocol.ResponseForkTo + 'parent\n')
         else:
-            self.__sendCommand(ResponseForkTo + 'child\n')
+            self.__sendCommand(DebugProtocol.ResponseForkTo + 'child\n')

     def __parseClientLine(self):
         """
@@ -744,8 +751,8 @@
                 line = self.codec.toUnicode(qs)
             else:
                 line = bytes(qs).decode()
-            if line.endswith(EOT):
-                line = line[:-len(EOT)]
+            if line.endswith(DebugProtocol.EOT):
+                line = line[:-len(DebugProtocol.EOT)]
                 if not line:
                     continue

@@ -768,7 +775,8 @@
                 resp = line[boc:eoc]
                 evalArg = self.__unicodeRe.sub(r"\1", line[eoc:-1])

-                if resp == ResponseLine or resp == ResponseStack:
+                if resp == DebugProtocol.ResponseLine or \
+                   resp == DebugProtocol.ResponseStack:
                     stack = eval(evalArg)
                     for s in stack:
                         s[0] = self.translate(s[0], True)
@@ -778,20 +786,20 @@
                         QTimer.singleShot(0, self.remoteContinue)
                     else:
                         self.debugServer.signalClientLine(cf[0], int(cf[1]),
-                                                    resp == ResponseStack)
+                                                    resp == DebugProtocol.ResponseStack)
                         self.debugServer.signalClientStack(stack)
                     continue

-                if resp == ResponseThreadList:
+                if resp == DebugProtocol.ResponseThreadList:
                     currentId, threadList = eval(evalArg)
                     self.debugServer.signalClientThreadList(currentId, threadList)
                     continue

-                if resp == ResponseThreadSet:
+                if resp == DebugProtocol.ResponseThreadSet:
                     self.debugServer.signalClientThreadSet()
                     continue

-                if resp == ResponseVariables:
+                if resp == DebugProtocol.ResponseVariables:
                     vlist = eval(evalArg)
                     scope = vlist[0]
                     try:
@@ -801,7 +809,7 @@
                     self.debugServer.signalClientVariables(scope, variables)
                     continue

-                if resp == ResponseVariable:
+                if resp == DebugProtocol.ResponseVariable:
                     vlist = eval(evalArg)
                     scope = vlist[0]
                     try:
@@ -811,15 +819,15 @@
                     self.debugServer.signalClientVariable(scope, variables)
                     continue

-                if resp == ResponseOK:
+                if resp == DebugProtocol.ResponseOK:
                     self.debugServer.signalClientStatement(False)
                     continue

-                if resp == ResponseContinue:
+                if resp == DebugProtocol.ResponseContinue:
                     self.debugServer.signalClientStatement(True)
                     continue

-                if resp == ResponseException:
+                if resp == DebugProtocol.ResponseException:
                     exc = self.translate(evalArg, True)
                     try:
                         exclist = eval(exc)
@@ -835,7 +843,7 @@
                     self.debugServer.signalClientException(exctype, excmessage, stack)
                     continue

-                if resp == ResponseSyntax:
+                if resp == DebugProtocol.ResponseSyntax:
                     exc = self.translate(evalArg, True)
                     try:
                         message, (fn, ln, cn) = eval(exc)
@@ -851,90 +859,90 @@
                     self.debugServer.signalClientSyntaxError(message, fn, ln, cn)
                     continue

-                if resp == ResponseExit:
+                if resp == DebugProtocol.ResponseExit:
                     self.debugServer.signalClientExit(evalArg)
                     continue

-                if resp == ResponseClearBreak:
+                if resp == DebugProtocol.ResponseClearBreak:
                     fn, lineno = evalArg.split(',')
                     lineno = int(lineno)
                     fn = self.translate(fn, True)
                     self.debugServer.signalClientClearBreak(fn, lineno)
                     continue

-                if resp == ResponseBPConditionError:
+                if resp == DebugProtocol.ResponseBPConditionError:
                     fn, lineno = evalArg.split(',')
                     lineno = int(lineno)
                     fn = self.translate(fn, True)
                     self.debugServer.signalClientBreakConditionError(fn, lineno)
                     continue

-                if resp == ResponseClearWatch:
+                if resp == DebugProtocol.ResponseClearWatch:
                     self.debugServer.signalClientClearWatch(evalArg)
                     continue

-                if resp == ResponseWPConditionError:
+                if resp == DebugProtocol.ResponseWPConditionError:
                     self.debugServer.signalClientWatchConditionError(evalArg)
                     continue

-                if resp == ResponseRaw:
+                if resp == DebugProtocol.ResponseRaw:
                     prompt, echo = eval(evalArg)
                     self.debugServer.signalClientRawInput(prompt, echo)
                     continue

-                if resp == ResponseBanner:
+                if resp == DebugProtocol.ResponseBanner:
                     version, platform, dbgclient = eval(evalArg)
                     self.debugServer.signalClientBanner(version, platform, dbgclient)
                     continue

-                if resp == ResponseCapabilities:
+                if resp == DebugProtocol.ResponseCapabilities:
                     cap, clType = eval(evalArg)
                     self.clientCapabilities = cap
                     self.debugServer.signalClientCapabilities(cap, clType)
                     continue

-                if resp == ResponseCompletion:
+                if resp == DebugProtocol.ResponseCompletion:
                     clstring, text = evalArg.split('||')
                     cl = eval(clstring)
                     self.debugServer.signalClientCompletionList(cl, text)
                     continue

-                if resp == PassiveStartup:
+                if resp == DebugProtocol.PassiveStartup:
                     fn, exc = evalArg.split('|')
                     exc = bool(exc)
                     fn = self.translate(fn, True)
                     self.debugServer.passiveStartUp(fn, exc)
                     continue

-                if resp == ResponseUTPrepared:
+                if resp == DebugProtocol.ResponseUTPrepared:
                     res, exc_type, exc_value = eval(evalArg)
                     self.debugServer.clientUtPrepared(res, exc_type, exc_value)
                     continue

-                if resp == ResponseUTStartTest:
+                if resp == DebugProtocol.ResponseUTStartTest:
                     testname, doc = eval(evalArg)
                     self.debugServer.clientUtStartTest(testname, doc)
                     continue

-                if resp == ResponseUTStopTest:
+                if resp == DebugProtocol.ResponseUTStopTest:
                     self.debugServer.clientUtStopTest()
                     continue

-                if resp == ResponseUTTestFailed:
+                if resp == DebugProtocol.ResponseUTTestFailed:
                     testname, traceback = eval(evalArg)
                     self.debugServer.clientUtTestFailed(testname, traceback)
                     continue

-                if resp == ResponseUTTestErrored:
+                if resp == DebugProtocol.ResponseUTTestErrored:
                     testname, traceback = eval(evalArg)
                     self.debugServer.clientUtTestErrored(testname, traceback)
                     continue

-                if resp == ResponseUTFinished:
+                if resp == DebugProtocol.ResponseUTFinished:
                     self.debugServer.clientUtFinished()
                     continue

-                if resp == RequestForkTo:
+                if resp == DebugProtocol.RequestForkTo:
                     self.__askForkTo()
                     continue
--- a/Debugger/DebuggerInterfacePython3.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/DebuggerInterfacePython3.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,13 +10,13 @@
 import sys
 import os

-from PyQt4.QtCore import *
+from PyQt4.QtCore import QObject, QTextCodec, QProcess, QTimer
 from PyQt4.QtGui import QInputDialog

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox

-from .DebugProtocol import *
+from . import DebugProtocol
 from . import DebugClientCapabilities

 import Preferences
@@ -214,7 +214,7 @@
                 if value.startswith('"') or value.startswith("'"):
                     value = value[1:-1]
                 clientEnv[str(key)] = str(value)
-            except UnpackError:
+            except ValueError:
                 pass

         ipaddr = self.debugServer.getHostAddress(True)
@@ -306,7 +306,7 @@
                 if value.startswith('"') or value.startswith("'"):
                     value = value[1:-1]
                 clientEnv[str(key)] = str(value)
-            except UnpackError:
+            except ValueError:
                 pass

         ipaddr = self.debugServer.getHostAddress(True)
@@ -389,7 +389,7 @@
         self.qsock.readyRead[()].disconnect(self.__parseClientLine)

         # close down socket, and shut down client as well.
-        self.__sendCommand('{0}\n'.format(RequestShutdown))
+        self.__sendCommand('{0}\n'.format(DebugProtocol.RequestShutdown))
         self.qsock.flush()

         self.qsock.close()
@@ -412,7 +412,7 @@

         @param env environment settings (dictionary)
         """
-        self.__sendCommand('{0}{1}\n'.format(RequestEnv, str(env)))
+        self.__sendCommand('{0}{1}\n'.format(DebugProtocol.RequestEnv, str(env)))

     def remoteLoad(self, fn, argv, wd, traceInterpreter=False, autoContinue=True,
                    autoFork=False, forkChild=False):
@@ -433,9 +433,10 @@

         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
-        self.__sendCommand('{0}{1}\n'.format(RequestForkMode, repr((autoFork, forkChild))))
+        self.__sendCommand('{0}{1}\n'.format(
+            DebugProtocol.RequestForkMode, repr((autoFork, forkChild))))
         self.__sendCommand('{0}{1}|{2}|{3}|{4:d}\n'.format(
-            RequestLoad, wd, fn, str(Utilities.parseOptionString(argv)),
+            DebugProtocol.RequestLoad, wd, fn, str(Utilities.parseOptionString(argv)),
              traceInterpreter))

     def remoteRun(self, fn, argv, wd, autoFork=False, forkChild=False):
@@ -450,9 +451,10 @@
         """
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
-        self.__sendCommand('{0}{1}\n'.format(RequestForkMode, repr((autoFork, forkChild))))
+        self.__sendCommand('{0}{1}\n'.format(
+            DebugProtocol.RequestForkMode, repr((autoFork, forkChild))))
         self.__sendCommand('{0}{1}|{2}|{3}\n'.format(
-            RequestRun, wd, fn, str(Utilities.parseOptionString(argv))))
+            DebugProtocol.RequestRun, wd, fn, str(Utilities.parseOptionString(argv))))

     def remoteCoverage(self, fn, argv, wd, erase=False):
         """
@@ -467,7 +469,7 @@
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('{0}{1}@@{2}@@{3}@@{4:d}\n'.format(
-            RequestCoverage, wd, fn, str(Utilities.parseOptionString(argv)),
+            DebugProtocol.RequestCoverage, wd, fn, str(Utilities.parseOptionString(argv)),
              erase))

     def remoteProfile(self, fn, argv, wd, erase=False):
@@ -482,7 +484,8 @@
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('{0}{1}|{2}|{3}|{4:d}\n'.format(
-            RequestProfile, wd, fn, str(Utilities.parseOptionString(argv)), erase))
+            DebugProtocol.RequestProfile, wd, fn,
+            str(Utilities.parseOptionString(argv)), erase))

     def remoteStatement(self, stmt):
         """
@@ -492,31 +495,31 @@
               should not have a trailing newline.
         """
         self.__sendCommand('{0}\n'.format(stmt))
-        self.__sendCommand(RequestOK + '\n')
+        self.__sendCommand(DebugProtocol.RequestOK + '\n')

     def remoteStep(self):
         """
         Public method to single step the debugged program.
         """
-        self.__sendCommand(RequestStep + '\n')
+        self.__sendCommand(DebugProtocol.RequestStep + '\n')

     def remoteStepOver(self):
         """
         Public method to step over the debugged program.
         """
-        self.__sendCommand(RequestStepOver + '\n')
+        self.__sendCommand(DebugProtocol.RequestStepOver + '\n')

     def remoteStepOut(self):
         """
         Public method to step out the debugged program.
         """
-        self.__sendCommand(RequestStepOut + '\n')
+        self.__sendCommand(DebugProtocol.RequestStepOut + '\n')

     def remoteStepQuit(self):
         """
         Public method to stop the debugged program.
         """
-        self.__sendCommand(RequestStepQuit + '\n')
+        self.__sendCommand(DebugProtocol.RequestStepQuit + '\n')

     def remoteContinue(self, special=False):
         """
@@ -524,7 +527,7 @@

         @param special flag indicating a special continue operation
         """
-        self.__sendCommand('{0}{1:d}\n'.format(RequestContinue, special))
+        self.__sendCommand('{0}{1:d}\n'.format(DebugProtocol.RequestContinue, special))

     def remoteBreakpoint(self, fn, line, set, cond=None, temp=False):
         """
@@ -538,7 +541,7 @@
         """
         fn = self.translate(fn, False)
         self.__sendCommand('{0}{1}@@{2:d}@@{3:d}@@{4:d}@@{5}\n'.format(
-                           RequestBreak, fn, line, temp, set, cond))
+                           DebugProtocol.RequestBreak, fn, line, temp, set, cond))

     def remoteBreakpointEnable(self, fn, line, enable):
         """
@@ -550,7 +553,7 @@
         """
         fn = self.translate(fn, False)
         self.__sendCommand('{0}{1},{2:d},{3:d}\n'.format(
-            RequestBreakEnable, fn, line, enable))
+            DebugProtocol.RequestBreakEnable, fn, line, enable))

     def remoteBreakpointIgnore(self, fn, line, count):
         """
@@ -562,7 +565,7 @@
         """
         fn = self.translate(fn, False)
         self.__sendCommand('{0}{1},{2:d},{3:d}\n'.format(
-            RequestBreakIgnore, fn, line, count))
+            DebugProtocol.RequestBreakIgnore, fn, line, count))

     def remoteWatchpoint(self, cond, set, temp=False):
         """
@@ -573,7 +576,8 @@
         @param temp flag indicating a temporary watch expression (boolean)
         """
         # cond is combination of cond and special (s. watch expression viewer)
-        self.__sendCommand('{0}{1}@@{2:d}@@{3:d}\n'.format(RequestWatch, cond, temp, set))
+        self.__sendCommand('{0}{1}@@{2:d}@@{3:d}\n'.format(
+            DebugProtocol.RequestWatch, cond, temp, set))

     def remoteWatchpointEnable(self, cond, enable):
         """
@@ -583,7 +587,8 @@
         @param enable flag indicating enabling or disabling a watch expression (boolean)
         """
         # cond is combination of cond and special (s. watch expression viewer)
-        self.__sendCommand('{0}{1},{2:d}\n'.format(RequestWatchEnable, cond, enable))
+        self.__sendCommand('{0}{1},{2:d}\n'.format(
+            DebugProtocol.RequestWatchEnable, cond, enable))

     def remoteWatchpointIgnore(self, cond, count):
         """
@@ -593,7 +598,8 @@
         @param count number of occurrences to ignore (int)
         """
         # cond is combination of cond and special (s. watch expression viewer)
-        self.__sendCommand('{0}{1},{2:d}\n'.format(RequestWatchIgnore, cond, count))
+        self.__sendCommand('{0}{1},{2:d}\n'.format(
+            DebugProtocol.RequestWatchIgnore, cond, count))

     def remoteRawInput(self, s):
         """
@@ -607,7 +613,7 @@
         """
         Public method to request the list of threads from the client.
         """
-        self.__sendCommand('{0}\n'.format(RequestThreadList))
+        self.__sendCommand('{0}\n'.format(DebugProtocol.RequestThreadList))

     def remoteSetThread(self, tid):
         """
@@ -615,7 +621,7 @@

         @param tid id of the thread (integer)
         """
-        self.__sendCommand('{0}{1:d}\n'.format(RequestThreadSet, tid))
+        self.__sendCommand('{0}{1:d}\n'.format(DebugProtocol.RequestThreadSet, tid))

     def remoteClientVariables(self, scope, filter, framenr=0):
         """
@@ -626,7 +632,7 @@
         @param framenr framenumber of the variables to retrieve (int)
         """
         self.__sendCommand('{0}{1:d}, {2:d}, {3}\n'.format(
-            RequestVariables, framenr, scope, str(filter)))
+            DebugProtocol.RequestVariables, framenr, scope, str(filter)))

     def remoteClientVariable(self, scope, filter, var, framenr=0):
         """
@@ -638,7 +644,7 @@
         @param framenr framenumber of the variables to retrieve (int)
         """
         self.__sendCommand('{0}{1}, {2:d}, {3:d}, {4}\n'.format(
-            RequestVariable, str(var), framenr, scope, str(filter)))
+            DebugProtocol.RequestVariable, str(var), framenr, scope, str(filter)))

     def remoteClientSetFilter(self, scope, filter):
         """
@@ -647,7 +653,8 @@
         @param scope the scope of the variables (0 = local, 1 = global)
         @param filter regexp string for variable names to filter out (string)
         """
-        self.__sendCommand('{0}{1:d}, "{2}"\n'.format(RequestSetFilter, scope, filter))
+        self.__sendCommand('{0}{1:d}, "{2}"\n'.format(
+            DebugProtocol.RequestSetFilter, scope, filter))

     def remoteEval(self, arg):
         """
@@ -655,7 +662,7 @@

         @param arg the arguments to evaluate (string)
         """
-        self.__sendCommand('{0}{1}\n'.format(RequestEval, arg))
+        self.__sendCommand('{0}{1}\n'.format(DebugProtocol.RequestEval, arg))

     def remoteExec(self, stmt):
         """
@@ -663,19 +670,19 @@

         @param stmt statement to execute (string)
         """
-        self.__sendCommand('{0}{1}\n'.format(RequestExec, stmt))
+        self.__sendCommand('{0}{1}\n'.format(DebugProtocol.RequestExec, stmt))

     def remoteBanner(self):
         """
         Public slot to get the banner info of the remote client.
         """
-        self.__sendCommand(RequestBanner + '\n')
+        self.__sendCommand(DebugProtocol.RequestBanner + '\n')

     def remoteCapabilities(self):
         """
         Public slot to get the debug clients capabilities.
         """
-        self.__sendCommand(RequestCapabilities + '\n')
+        self.__sendCommand(DebugProtocol.RequestCapabilities + '\n')

     def remoteCompletion(self, text):
         """
@@ -684,7 +691,7 @@

         @param text the text to be completed (string)
         """
-        self.__sendCommand("{0}{1}\n".format(RequestCompletion, text))
+        self.__sendCommand("{0}{1}\n".format(DebugProtocol.RequestCompletion, text))

     def remoteUTPrepare(self, fn, tn, tfn, cov, covname, coverase):
         """
@@ -700,19 +707,19 @@
         """
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('{0}{1}|{2}|{3}|{4:d}|{5}|{6:d}\n'.format(
-            RequestUTPrepare, fn, tn, tfn, cov, covname, coverase))
+            DebugProtocol.RequestUTPrepare, fn, tn, tfn, cov, covname, coverase))

     def remoteUTRun(self):
         """
         Public method to start a unittest run.
         """
-        self.__sendCommand('{0}\n'.format(RequestUTRun))
+        self.__sendCommand('{0}\n'.format(DebugProtocol.RequestUTRun))

     def remoteUTStop(self):
         """
         Public method to stop a unittest run.
         """
-        self.__sendCommand('{0}\n'.format(RequestUTStop))
+        self.__sendCommand('{0}\n'.format(DebugProtocol.RequestUTStop))

     def __askForkTo(self):
         """
@@ -726,9 +733,9 @@
             selections,
             0, False)
         if not ok or res == selections[0]:
-            self.__sendCommand(ResponseForkTo + 'parent\n')
+            self.__sendCommand(DebugProtocol.ResponseForkTo + 'parent\n')
         else:
-            self.__sendCommand(ResponseForkTo + 'child\n')
+            self.__sendCommand(DebugProtocol.ResponseForkTo + 'child\n')

     def __parseClientLine(self):
         """
@@ -740,8 +747,8 @@
                 line = self.codec.toUnicode(qs)
             else:
                 line = bytes(qs).decode()
-            if line.endswith(EOT):
-                line = line[:-len(EOT)]
+            if line.endswith(DebugProtocol.EOT):
+                line = line[:-len(DebugProtocol.EOT)]
                 if not line:
                     continue

@@ -763,7 +770,8 @@
             if boc >= 0 and eoc > boc:
                 resp = line[boc:eoc]

-                if resp == ResponseLine or resp == ResponseStack:
+                if resp == DebugProtocol.ResponseLine or \
+                   resp == DebugProtocol.ResponseStack:
                     stack = eval(line[eoc:-1])
                     for s in stack:
                         s[0] = self.translate(s[0], True)
@@ -773,20 +781,20 @@
                         QTimer.singleShot(0, self.remoteContinue)
                     else:
                         self.debugServer.signalClientLine(cf[0], int(cf[1]),
-                                                    resp == ResponseStack)
+                                                    resp == DebugProtocol.ResponseStack)
                         self.debugServer.signalClientStack(stack)
                     continue

-                if resp == ResponseThreadList:
+                if resp == DebugProtocol.ResponseThreadList:
                     currentId, threadList = eval(line[eoc:-1])
                     self.debugServer.signalClientThreadList(currentId, threadList)
                     continue

-                if resp == ResponseThreadSet:
+                if resp == DebugProtocol.ResponseThreadSet:
                     self.debugServer.signalClientThreadSet()
                     continue

-                if resp == ResponseVariables:
+                if resp == DebugProtocol.ResponseVariables:
                     vlist = eval(line[eoc:-1])
                     scope = vlist[0]
                     try:
@@ -796,7 +804,7 @@
                     self.debugServer.signalClientVariables(scope, variables)
                     continue

-                if resp == ResponseVariable:
+                if resp == DebugProtocol.ResponseVariable:
                     vlist = eval(line[eoc:-1])
                     scope = vlist[0]
                     try:
@@ -806,15 +814,15 @@
                     self.debugServer.signalClientVariable(scope, variables)
                     continue

-                if resp == ResponseOK:
+                if resp == DebugProtocol.ResponseOK:
                     self.debugServer.signalClientStatement(False)
                     continue

-                if resp == ResponseContinue:
+                if resp == DebugProtocol.ResponseContinue:
                     self.debugServer.signalClientStatement(True)
                     continue

-                if resp == ResponseException:
+                if resp == DebugProtocol.ResponseException:
                     exc = line[eoc:-1]
                     exc = self.translate(exc, True)
                     try:
@@ -831,7 +839,7 @@
                     self.debugServer.signalClientException(exctype, excmessage, stack)
                     continue

-                if resp == ResponseSyntax:
+                if resp == DebugProtocol.ResponseSyntax:
                     exc = line[eoc:-1]
                     exc = self.translate(exc, True)
                     try:
@@ -848,92 +856,92 @@
                     self.debugServer.signalClientSyntaxError(message, fn, ln, cn)
                     continue

-                if resp == ResponseExit:
+                if resp == DebugProtocol.ResponseExit:
                     self.debugServer.signalClientExit(line[eoc:-1])
                     continue

-                if resp == ResponseClearBreak:
+                if resp == DebugProtocol.ResponseClearBreak:
                     fn, lineno = line[eoc:-1].split(',')
                     lineno = int(lineno)
                     fn = self.translate(fn, True)
                     self.debugServer.signalClientClearBreak(fn, lineno)
                     continue

-                if resp == ResponseBPConditionError:
+                if resp == DebugProtocol.ResponseBPConditionError:
                     fn, lineno = line[eoc:-1].split(',')
                     lineno = int(lineno)
                     fn = self.translate(fn, True)
                     self.debugServer.signalClientBreakConditionError(fn, lineno)
                     continue

-                if resp == ResponseClearWatch:
+                if resp == DebugProtocol.ResponseClearWatch:
                     cond = line[eoc:-1]
                     self.debugServer.signalClientClearWatch(cond)
                     continue

-                if resp == ResponseWPConditionError:
+                if resp == DebugProtocol.ResponseWPConditionError:
                     cond = line[eoc:-1]
                     self.debugServer.signalClientWatchConditionError(cond)
                     continue

-                if resp == ResponseRaw:
+                if resp == DebugProtocol.ResponseRaw:
                     prompt, echo = eval(line[eoc:-1])
                     self.debugServer.signalClientRawInput(prompt, echo)
                     continue

-                if resp == ResponseBanner:
+                if resp == DebugProtocol.ResponseBanner:
                     version, platform, dbgclient = eval(line[eoc:-1])
                     self.debugServer.signalClientBanner(version, platform, dbgclient)
                     continue

-                if resp == ResponseCapabilities:
+                if resp == DebugProtocol.ResponseCapabilities:
                     cap, clType = eval(line[eoc:-1])
                     self.clientCapabilities = cap
                     self.debugServer.signalClientCapabilities(cap, clType)
                     continue

-                if resp == ResponseCompletion:
+                if resp == DebugProtocol.ResponseCompletion:
                     clstring, text = line[eoc:-1].split('||')
                     cl = eval(clstring)
                     self.debugServer.signalClientCompletionList(cl, text)
                     continue

-                if resp == PassiveStartup:
+                if resp == DebugProtocol.PassiveStartup:
                     fn, exc = line[eoc:-1].split('|')
                     exc = bool(exc)
                     fn = self.translate(fn, True)
                     self.debugServer.passiveStartUp(fn, exc)
                     continue

-                if resp == ResponseUTPrepared:
+                if resp == DebugProtocol.ResponseUTPrepared:
                     res, exc_type, exc_value = eval(line[eoc:-1])
                     self.debugServer.clientUtPrepared(res, exc_type, exc_value)
                     continue

-                if resp == ResponseUTStartTest:
+                if resp == DebugProtocol.ResponseUTStartTest:
                     testname, doc = eval(line[eoc:-1])
                     self.debugServer.clientUtStartTest(testname, doc)
                     continue

-                if resp == ResponseUTStopTest:
+                if resp == DebugProtocol.ResponseUTStopTest:
                     self.debugServer.clientUtStopTest()
                     continue

-                if resp == ResponseUTTestFailed:
+                if resp == DebugProtocol.ResponseUTTestFailed:
                     testname, traceback = eval(line[eoc:-1])
                     self.debugServer.clientUtTestFailed(testname, traceback)
                     continue

-                if resp == ResponseUTTestErrored:
+                if resp == DebugProtocol.ResponseUTTestErrored:
                     testname, traceback = eval(line[eoc:-1])
                     self.debugServer.clientUtTestErrored(testname, traceback)
                     continue

-                if resp == ResponseUTFinished:
+                if resp == DebugProtocol.ResponseUTFinished:
                     self.debugServer.clientUtFinished()
                     continue

-                if resp == RequestForkTo:
+                if resp == DebugProtocol.RequestForkTo:
                     self.__askForkTo()
                     continue
--- a/Debugger/DebuggerInterfaceRuby.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/DebuggerInterfaceRuby.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,12 +9,12 @@

 import os

-from PyQt4.QtCore import *
+from PyQt4.QtCore import QObject, QTextCodec, QProcess, QTimer

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox

-from .DebugProtocol import *
+from . import DebugProtocol
 from . import DebugClientCapabilities

 import Preferences
@@ -192,7 +192,7 @@
                 if value.startswith('"') or value.startswith("'"):
                     value = value[1:-1]
                 clientEnv[str(key)] = str(value)
-            except UnpackError:
+            except ValueError:
                 pass

         ipaddr = self.debugServer.getHostAddress(True)
@@ -282,7 +282,7 @@
                 if value.startswith('"') or value.startswith("'"):
                     value = value[1:-1]
                 clientEnv[str(key)] = str(value)
-            except UnpackError:
+            except ValueError:
                 pass

         ipaddr = self.debugServer.getHostAddress(True)
@@ -365,7 +365,7 @@
         self.qsock.readyRead[()].disconnect(self.__parseClientLine)

         # close down socket, and shut down client as well.
-        self.__sendCommand('{0}\n'.format(RequestShutdown))
+        self.__sendCommand('{0}\n'.format(DebugProtocol.RequestShutdown))
         self.qsock.flush()

         self.qsock.close()
@@ -388,7 +388,7 @@

         @param env environment settings (dictionary)
         """
-        self.__sendCommand('{0}{1}\n'.format(RequestEnv, str(env)))
+        self.__sendCommand('{0}{1}\n'.format(DebugProtocol.RequestEnv, str(env)))

     def remoteLoad(self, fn, argv, wd, traceInterpreter=False, autoContinue=True,
                    autoFork=False, forkChild=False):
@@ -411,7 +411,7 @@
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('{0}{1}|{2}|{3}|{4:d}\n'.format(
-            RequestLoad, wd, fn, str(Utilities.parseOptionString(argv)),
+            DebugProtocol.RequestLoad, wd, fn, str(Utilities.parseOptionString(argv)),
              traceInterpreter))

     def remoteRun(self, fn, argv, wd, autoFork=False, forkChild=False):
@@ -428,7 +428,7 @@
         wd = self.translate(wd, False)
         fn = self.translate(os.path.abspath(fn), False)
         self.__sendCommand('{0}{1}|{2}|{3}\n'.format(
-            RequestRun, wd, fn, str(Utilities.parseOptionString(argv))))
+            DebugProtocol.RequestRun, wd, fn, str(Utilities.parseOptionString(argv))))

     def remoteCoverage(self, fn, argv, wd, erase=False):
         """
@@ -461,31 +461,31 @@
               should not have a trailing newline.
         """
         self.__sendCommand('{0}\n'.format(stmt))
-        self.__sendCommand(RequestOK + '\n')
+        self.__sendCommand(DebugProtocol.RequestOK + '\n')

     def remoteStep(self):
         """
         Public method to single step the debugged program.
         """
-        self.__sendCommand(RequestStep + '\n')
+        self.__sendCommand(DebugProtocol.RequestStep + '\n')

     def remoteStepOver(self):
         """
         Public method to step over the debugged program.
         """
-        self.__sendCommand(RequestStepOver + '\n')
+        self.__sendCommand(DebugProtocol.RequestStepOver + '\n')

     def remoteStepOut(self):
         """
         Public method to step out the debugged program.
         """
-        self.__sendCommand(RequestStepOut + '\n')
+        self.__sendCommand(DebugProtocol.RequestStepOut + '\n')

     def remoteStepQuit(self):
         """
         Public method to stop the debugged program.
         """
-        self.__sendCommand(RequestStepQuit + '\n')
+        self.__sendCommand(DebugProtocol.RequestStepQuit + '\n')

     def remoteContinue(self, special=False):
         """
@@ -493,7 +493,7 @@

         @param special flag indicating a special continue operation (boolean)
         """
-        self.__sendCommand('{0}{1:d}\n'.format(RequestContinue, special))
+        self.__sendCommand('{0}{1:d}\n'.format(DebugProtocol.RequestContinue, special))

     def remoteBreakpoint(self, fn, line, set, cond=None, temp=False):
         """
@@ -507,7 +507,7 @@
         """
         fn = self.translate(fn, False)
         self.__sendCommand('{0}{1}@@{2:d}@@{3:d}@@{4:d}@@{5}\n'.format(
-                           RequestBreak, fn, line, temp, set, cond))
+                           DebugProtocol.RequestBreak, fn, line, temp, set, cond))

     def remoteBreakpointEnable(self, fn, line, enable):
         """
@@ -519,7 +519,7 @@
         """
         fn = self.translate(fn, False)
         self.__sendCommand('{0}{1},{2:d},{3:d}\n'.format(
-            RequestBreakEnable, fn, line, enable))
+            DebugProtocol.RequestBreakEnable, fn, line, enable))

     def remoteBreakpointIgnore(self, fn, line, count):
         """
@@ -531,7 +531,7 @@
         """
         fn = self.translate(fn, False)
         self.__sendCommand('{0}{1},{2:d},{3:d}\n'.format(
-            RequestBreakIgnore, fn, line, count))
+            DebugProtocol.RequestBreakIgnore, fn, line, count))

     def remoteWatchpoint(self, cond, set, temp=False):
         """
@@ -542,7 +542,8 @@
         @param temp flag indicating a temporary watch expression (boolean)
         """
         # cond is combination of cond and special (s. watch expression viewer)
-        self.__sendCommand('{0}{1}@@{2:d}@@{3:d}\n'.format(RequestWatch, cond, temp, set))
+        self.__sendCommand('{0}{1}@@{2:d}@@{3:d}\n'.format(
+            DebugProtocol.RequestWatch, cond, temp, set))

     def remoteWatchpointEnable(self, cond, enable):
         """
@@ -552,7 +553,8 @@
         @param enable flag indicating enabling or disabling a watch expression (boolean)
         """
         # cond is combination of cond and special (s. watch expression viewer)
-        self.__sendCommand('{0}{1},{2:d}\n'.format(RequestWatchEnable, cond, enable))
+        self.__sendCommand('{0}{1},{2:d}\n'.format(
+            DebugProtocol.RequestWatchEnable, cond, enable))

     def remoteWatchpointIgnore(self, cond, count):
         """
@@ -562,7 +564,8 @@
         @param count number of occurrences to ignore (int)
         """
         # cond is combination of cond and special (s. watch expression viewer)
-        self.__sendCommand('{0}{1},{2:d}\n'.format(RequestWatchIgnore, cond, count))
+        self.__sendCommand('{0}{1},{2:d}\n'.format(
+            DebugProtocol.RequestWatchIgnore, cond, count))

     def remoteRawInput(self, s):
         """
@@ -595,7 +598,7 @@
         @param framenr framenumber of the variables to retrieve (int)
         """
         self.__sendCommand('{0}{1:d}, {2:d}, {3}\n'.format(
-            RequestVariables, framenr, scope, str(filter)))
+            DebugProtocol.RequestVariables, framenr, scope, str(filter)))

     def remoteClientVariable(self, scope, filter, var, framenr=0):
         """
@@ -607,7 +610,7 @@
         @param framenr framenumber of the variables to retrieve (int)
         """
         self.__sendCommand('{0}{1}, {2:d}, {3:d}, {4}\n'.format(
-            RequestVariable, str(var), framenr, scope, str(filter)))
+            DebugProtocol.RequestVariable, str(var), framenr, scope, str(filter)))

     def remoteClientSetFilter(self, scope, filter):
         """
@@ -616,7 +619,8 @@
         @param scope the scope of the variables (0 = local, 1 = global)
         @param filter regexp string for variable names to filter out (string)
         """
-        self.__sendCommand('{0}{1:d}, "{2}"\n'.format(RequestSetFilter, scope, filter))
+        self.__sendCommand('{0}{1:d}, "{2}"\n'.format(
+            DebugProtocol.RequestSetFilter, scope, filter))

     def remoteEval(self, arg):
         """
@@ -624,7 +628,7 @@

         @param arg the arguments to evaluate (string)
         """
-        self.__sendCommand('{0}{1}\n'.format(RequestEval, arg))
+        self.__sendCommand('{0}{1}\n'.format(DebugProtocol.RequestEval, arg))

     def remoteExec(self, stmt):
         """
@@ -632,19 +636,19 @@

         @param stmt statement to execute (string)
         """
-        self.__sendCommand('{0}{1}\n'.format(RequestExec, stmt))
+        self.__sendCommand('{0}{1}\n'.format(DebugProtocol.RequestExec, stmt))

     def remoteBanner(self):
         """
         Public slot to get the banner info of the remote client.
         """
-        self.__sendCommand(RequestBanner + '\n')
+        self.__sendCommand(DebugProtocol.RequestBanner + '\n')

     def remoteCapabilities(self):
         """
         Public slot to get the debug clients capabilities.
         """
-        self.__sendCommand(RequestCapabilities + '\n')
+        self.__sendCommand(DebugProtocol.RequestCapabilities + '\n')

     def remoteCompletion(self, text):
         """
@@ -653,7 +657,7 @@

         @param text the text to be completed (string)
         """
-        self.__sendCommand("{0}{1}\n".format(RequestCompletion, text))
+        self.__sendCommand("{0}{1}\n".format(DebugProtocol.RequestCompletion, text))

     def remoteUTPrepare(self, fn, tn, tfn, cov, covname, coverase):
         """
@@ -691,8 +695,8 @@
                 line = self.codec.toUnicode(qs)
             else:
                 line = bytes(qs).decode()
-            if line.endswith(EOT):
-                line = line[:-len(EOT)]
+            if line.endswith(DebugProtocol.EOT):
+                line = line[:-len(DebugProtocol.EOT)]
                 if not line:
                     continue

@@ -714,7 +718,7 @@
             if boc >= 0 and eoc > boc:
                 resp = line[boc:eoc]

-                if resp == ResponseLine:
+                if resp == DebugProtocol.ResponseLine:
                     stack = eval(line[eoc:-1])
                     for s in stack:
                         s[0] = self.translate(s[0], True)
@@ -727,7 +731,7 @@
                         self.debugServer.signalClientStack(stack)
                     continue

-                if resp == ResponseVariables:
+                if resp == DebugProtocol.ResponseVariables:
                     vlist = eval(line[eoc:-1])
                     scope = vlist[0]
                     try:
@@ -737,7 +741,7 @@
                     self.debugServer.signalClientVariables(scope, variables)
                     continue

-                if resp == ResponseVariable:
+                if resp == DebugProtocol.ResponseVariable:
                     vlist = eval(line[eoc:-1])
                     scope = vlist[0]
                     try:
@@ -747,15 +751,15 @@
                     self.debugServer.signalClientVariable(scope, variables)
                     continue

-                if resp == ResponseOK:
+                if resp == DebugProtocol.ResponseOK:
                     self.debugServer.signalClientStatement(False)
                     continue

-                if resp == ResponseContinue:
+                if resp == DebugProtocol.ResponseContinue:
                     self.debugServer.signalClientStatement(True)
                     continue

-                if resp == ResponseException:
+                if resp == DebugProtocol.ResponseException:
                     exc = line[eoc:-1]
                     exc = self.translate(exc, True)
                     try:
@@ -770,7 +774,7 @@
                     self.debugServer.signalClientException(exctype, excmessage, stack)
                     continue

-                if resp == ResponseSyntax:
+                if resp == DebugProtocol.ResponseSyntax:
                     exc = line[eoc:-1]
                     exc = self.translate(exc, True)
                     try:
@@ -785,40 +789,40 @@
                     self.debugServer.signalClientSyntaxError(message, fn, ln, cn)
                     continue

-                if resp == ResponseExit:
+                if resp == DebugProtocol.ResponseExit:
                     self.debugServer.signalClientExit(line[eoc:-1])
                     continue

-                if resp == ResponseClearBreak:
+                if resp == DebugProtocol.ResponseClearBreak:
                     fn, lineno = line[eoc:-1].split(',')
                     lineno = int(lineno)
                     fn = self.translate(fn, True)
                     self.debugServer.signalClientClearBreak(fn, lineno)
                     continue

-                if resp == ResponseClearWatch:
+                if resp == DebugProtocol.ResponseClearWatch:
                     cond = line[eoc:-1]
                     self.debugServer.signalClientClearWatch(cond)
                     continue

-                if resp == ResponseBanner:
+                if resp == DebugProtocol.ResponseBanner:
                     version, platform, dbgclient = eval(line[eoc:-1])
                     self.debugServer.signalClientBanner(version, platform, dbgclient)
                     continue

-                if resp == ResponseCapabilities:
+                if resp == DebugProtocol.ResponseCapabilities:
                     cap, clType = eval(line[eoc:-1])
                     self.clientCapabilities = cap
                     self.debugServer.signalClientCapabilities(cap, clType)
                     continue

-                if resp == ResponseCompletion:
+                if resp == DebugProtocol.ResponseCompletion:
                     clstring, text = line[eoc:-1].split('||')
                     cl = eval(clstring)
                     self.debugServer.signalClientCompletionList(cl, text)
                     continue

-                if resp == PassiveStartup:
+                if resp == DebugProtocol.PassiveStartup:
                     fn, exc = line[eoc:-1].split('|')
                     exc = bool(exc)
                     fn = self.translate(fn, True)
--- a/Debugger/EditBreakpointDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/EditBreakpointDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os.path

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from E5Gui.E5Completers import E5FileCompleter
 from E5Gui import E5FileDialog
--- a/Debugger/EditWatchpointDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/EditWatchpointDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing a dialog to edit watch expression properties.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from .Ui_EditWatchpointDialog import Ui_EditWatchpointDialog
--- a/Debugger/ExceptionLogger.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/ExceptionLogger.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the Exception Logger widget.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt
+from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QMenu

 from E5Gui.E5Application import e5App
--- a/Debugger/ExceptionsFilterDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/ExceptionsFilterDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the exceptions filter dialog.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from .Ui_ExceptionsFilterDialog import Ui_ExceptionsFilterDialog
--- a/Debugger/StartDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/StartDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the Start Program dialog.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Debugger/VariableDetailDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/VariableDetailDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing the variable detail dialog.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog

 from .Ui_VariableDetailDialog import Ui_VariableDetailDialog
--- a/Debugger/VariablesFilterDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/VariablesFilterDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing the variables filter dialog.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from Debugger.Config import ConfigVarTypeDispStrings
 import Preferences
--- a/Debugger/VariablesViewer.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/VariablesViewer.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,9 @@
 Module implementing the variables viewer widget.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt, QRegExp
+from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QApplication, QAbstractItemView, \
+    QMenu

 from E5Gui.E5Application import e5App
--- a/Debugger/WatchPointModel.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/WatchPointModel.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,7 @@
 Module implementing the Watch expression model.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex, QObject


 class WatchPointModel(QAbstractItemModel):
--- a/Debugger/WatchPointViewer.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Debugger/WatchPointViewer.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,9 @@
 Module implementing the watch expression viewer widget.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt, QModelIndex
+from PyQt4.QtGui import QTreeView, QAbstractItemView, QMenu, QSortFilterProxyModel, \
+    QHeaderView, QItemSelectionModel, QDialog

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Source/eric5.Graphics.UMLItem.html	Sat Jun 04 11:53:15 2011 +0200
+++ b/Documentation/Source/eric5.Graphics.UMLItem.html	Sun Jun 05 18:25:36 2011 +0200
@@ -22,7 +22,7 @@
 <body><a NAME="top" ID="top"></a>
 <h1>eric5.Graphics.UMLItem</h1>
 <p>
-Module implementing the UMLWidget base class.
+Module implementing the UMLItem base class.
 </p>
 <h3>Global Attributes</h3>
 <table>
--- a/Documentation/Source/index-eric5.Graphics.html	Sat Jun 04 11:53:15 2011 +0200
+++ b/Documentation/Source/index-eric5.Graphics.html	Sun Jun 05 18:25:36 2011 +0200
@@ -71,7 +71,7 @@
 <td>Module implementing a subclass of E5GraphicsView for our diagrams.</td>
 </tr><tr>
 <td><a href="eric5.Graphics.UMLItem.html">UMLItem</a></td>
-<td>Module implementing the UMLWidget base class.</td>
+<td>Module implementing the UMLItem base class.</td>
 </tr><tr>
 <td><a href="eric5.Graphics.UMLSceneSizeDialog.html">UMLSceneSizeDialog</a></td>
 <td>Module implementing a dialog to set the scene sizes.</td>
--- a/E5Graphics/E5ArrowItem.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/E5Graphics/E5ArrowItem.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,15 +7,15 @@
 Module implementing a graphics item subclass for an arrow.
 """

-from math import *
+import math

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QPointF, QRectF, QSizeF, QLineF, Qt
+from PyQt4.QtGui import QAbstractGraphicsShapeItem, QGraphicsItem, QStyle, QPen, QPolygonF

 NormalArrow = 1
 WideArrow = 2

-ArrowheadAngleFactor = 0.26179938779914941  # 0.5 * atan(sqrt(3.0) / 3.0)
+ArrowheadAngleFactor = 0.26179938779914941  # 0.5 * math.atan(math.sqrt(3.0) / 3.0)


 class E5ArrowItem(QAbstractGraphicsShapeItem):
@@ -113,17 +113,17 @@

         # draw the arrow head
         arrowAngle = self._type * ArrowheadAngleFactor
-        slope = atan2(line.dy(), line.dx())
+        slope = math.atan2(line.dy(), line.dx())

         # Calculate left arrow point
         arrowSlope = slope + arrowAngle
-        a1 = QPointF(self._end.x() - self._halfLength * cos(arrowSlope),
-                     self._end.y() - self._halfLength * sin(arrowSlope))
+        a1 = QPointF(self._end.x() - self._halfLength * math.cos(arrowSlope),
+                     self._end.y() - self._halfLength * math.sin(arrowSlope))

         # Calculate right arrow point
         arrowSlope = slope - arrowAngle
-        a2 = QPointF(self._end.x() - self._halfLength * cos(arrowSlope),
-                     self._end.y() - self._halfLength * sin(arrowSlope))
+        a2 = QPointF(self._end.x() - self._halfLength * math.cos(arrowSlope),
+                     self._end.y() - self._halfLength * math.sin(arrowSlope))

         if self._filled:
             painter.setBrush(Qt.black)
--- a/E5Graphics/E5GraphicsView.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/E5Graphics/E5GraphicsView.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import sys

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QRectF, QSize, QSizeF, Qt
+from PyQt4.QtGui import QGraphicsView, QBrush, QPainter, QPixmap, QFont, QColor

 import Preferences
--- a/E5Gui/E5Led.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/E5Gui/E5Led.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@
 It was inspired by KLed.
 """

-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from PyQt4.QtCore import Qt, QSize
+from PyQt4.QtGui import QWidget, QColor, QRadialGradient, QPalette, QPainter, QBrush

 E5LedRectangular = 0
 E5LedCircular = 1
--- a/E5Gui/E5ModelMenu.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/E5Gui/E5ModelMenu.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a menu populated from a QAbstractItemModel.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, QModelIndex, QPoint
+from PyQt4.QtGui import QMenu, QFontMetrics, QAction, QApplication, QDrag, QPixmap

 import UI.PixmapCache
--- a/E5Gui/E5ModelToolBar.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/E5Gui/E5ModelToolBar.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a tool bar populated from a QAbstractItemModel.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, QModelIndex, QPoint, QEvent
+from PyQt4.QtGui import QApplication, QDrag, QPixmap, QToolBar, QIcon, QToolButton

 from .E5ModelMenu import E5ModelMenu
--- a/E5Gui/E5ToolBarDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/E5Gui/E5ToolBarDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,9 @@
 Module implementing a toolbar configuration dialog.
 """

-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSlot, Qt
+from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem, QColor, \
+    QInputDialog, QLineEdit, QListWidgetItem, QAbstractButton

 from E5Gui import E5MessageBox

@@ -58,8 +59,10 @@
         self.__currentToolBarItem = None
         self.__removedToolBarIDs = []   # remember custom toolbars to be deleted

-        self.__widgetActionToToolBarItemID = {}  # maps widget action IDs to toolbar item IDs
-        self.__toolBarItemToWidgetActionID = {}  # maps toolbar item IDs to widget action IDs
+        self.__widgetActionToToolBarItemID = {}
+            # maps widget action IDs to toolbar item IDs
+        self.__toolBarItemToWidgetActionID = {}
+            # maps toolbar item IDs to widget action IDs

         self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png"))
         self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
--- a/E5Gui/E5ToolBarManager.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/E5Gui/E5ToolBarManager.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a toolbar manager class.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QObject, QByteArray, QDataStream, QIODevice
+from PyQt4.QtGui import QToolBar


 class E5ToolBarManager(QObject):
@@ -231,7 +231,7 @@
             if action.isSeparator():
                 del action
             else:
-                self.__actionToToolBars[id(action)].remove(toolBar)
+                self.__actionToToolBars[id(action)].remove(toolBar)  # __IGNORE_WARNING__

         # step 3: set the actions as requested
         newActionsWithSeparators = []
@@ -261,7 +261,7 @@

         @param toolBar reference to the toolbar to configure (QToolBar)
         """
-        if not isDefaultToolBar():
+        if not self.isDefaultToolBar():
             return
         self.setToolBar(toolBar, self.__defaultToolBars[id(toolBar)])
--- a/E5Network/E5NetworkMonitor.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/E5Network/E5NetworkMonitor.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a network monitor dialog.
 """

-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from PyQt4.QtCore import Qt, QAbstractTableModel, QModelIndex, QUrl
+from PyQt4.QtGui import QDialog, QStandardItemModel, QSortFilterProxyModel
 from PyQt4.QtNetwork import QNetworkRequest, QNetworkAccessManager

 import UI.PixmapCache
--- a/Graphics/ApplicationDiagram.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Graphics/ApplicationDiagram.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,7 @@
 import os
 import glob

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QApplication, QProgressDialog

 from .UMLDialog import UMLDialog
 from .PackageItem import PackageItem, PackageModel
--- a/Graphics/AssociationItem.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Graphics/AssociationItem.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a graphics item for an association between two items.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QPointF, QRectF, QLineF
+from PyQt4.QtGui import QGraphicsItem

 from E5Graphics.E5ArrowItem import E5ArrowItem, NormalArrow, WideArrow
--- a/Graphics/ClassItem.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Graphics/ClassItem.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing an UML like class item.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QFont, QGraphicsSimpleTextItem, QStyle

 from .UMLItem import UMLItem
--- a/Graphics/ImportsDiagram.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Graphics/ImportsDiagram.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,7 @@
 import glob
 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QProgressDialog, QApplication, QGraphicsTextItem

 from .UMLDialog import UMLDialog
 from .ModuleItem import ModuleItem, ModuleModel
--- a/Graphics/ModuleItem.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Graphics/ModuleItem.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing a module item.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QFont, QGraphicsSimpleTextItem, QStyle

 from .UMLItem import UMLItem
--- a/Graphics/PackageDiagram.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Graphics/PackageDiagram.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,7 @@
 import os.path
 import itertools

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QProgressDialog, QApplication, QGraphicsTextItem

 from .UMLDialog import UMLDialog
 from .ClassItem import ClassItem, ClassModel
--- a/Graphics/PackageItem.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Graphics/PackageItem.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing a package item.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QFont, QGraphicsSimpleTextItem, QStyle

 from .UMLItem import UMLItem

@@ -33,7 +32,7 @@

         @param modulename module name to be added (string)
         """
-        self.moduleslist.append(classname)
+        self.moduleslist.append(modulename)

     def getModules(self):
         """
--- a/Graphics/PixmapDiagram.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Graphics/PixmapDiagram.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,10 @@
 Module implementing a dialog showing a pixmap.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt, QSize
+from PyQt4.QtGui import QMainWindow, QLabel, QPalette, QSizePolicy, QScrollArea, \
+    QAction, QMenu, QToolBar, QImage, QPixmap, QDialog, QPrinter, QPrintDialog, \
+    QPainter, QFont, QColor

 from E5Gui import E5MessageBox
--- a/Graphics/SvgDiagram.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Graphics/SvgDiagram.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,9 @@
 Module implementing a dialog showing a SVG graphic.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt, QSize
+from PyQt4.QtGui import QMainWindow, QPalette, QSizePolicy, QScrollArea, QAction, QMenu, \
+    QToolBar, QDialog, QPrinter, QPrintDialog, QPainter, QFont, QColor
 from PyQt4.QtSvg import QSvgWidget

 from .ZoomDialog import ZoomDialog
--- a/Graphics/UMLClassDiagram.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Graphics/UMLClassDiagram.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,7 @@

 import itertools

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QGraphicsTextItem

 import Utilities.ModuleParser
--- a/Graphics/UMLDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Graphics/UMLDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog showing UML like diagrams.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt
+from PyQt4.QtGui import QMainWindow, QAction, QToolBar, QGraphicsScene

 from .UMLGraphicsView import UMLGraphicsView
--- a/Graphics/UMLGraphicsView.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Graphics/UMLGraphicsView.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a subclass of E5GraphicsView for our diagrams.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, QSignalMapper, QFileInfo
+from PyQt4.QtGui import QAction, QToolBar, QDialog, QPrinter, QPrintDialog

 from E5Graphics.E5GraphicsView import E5GraphicsView

@@ -256,7 +256,7 @@

         # step 2: select all given items
         for itm in items:
-            if isinstance(itm, UMLWidget):
+            if isinstance(itm, UMLItem):
                 itm.setSelected(True)

     def selectItem(self, item):
@@ -265,7 +265,7 @@

         @param item item to be selected (QGraphicsItemItem)
         """
-        if isinstance(item, UMLWidget):
+        if isinstance(item, UMLItem):
             item.setSelected(not item.isSelected())

     def __deleteShape(self):
--- a/Graphics/UMLItem.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Graphics/UMLItem.py	Sun Jun 05 18:25:36 2011 +0200
@@ -4,11 +4,11 @@
 #

 """
-Module implementing the UMLWidget base class.
+Module implementing the UMLItem base class.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt, QSizeF
+from PyQt4.QtGui import QGraphicsItem, QGraphicsRectItem, QStyle

 import Preferences
--- a/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,7 @@
 Module implementing a QNetworkReply subclass reporting a blocked request.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import QTimer
 from PyQt4.QtNetwork import QNetworkReply, QNetworkAccessManager
--- a/Helpviewer/AdBlock/AdBlockDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/AdBlock/AdBlockDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the AdBlock configuration dialog.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QUrl
+from PyQt4.QtGui import QDialog, QMenu, QToolButton, QApplication, QDesktopServices

 from E5Gui.E5TreeSortFilterProxyModel import E5TreeSortFilterProxyModel
--- a/Helpviewer/AdBlock/AdBlockManager.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/AdBlock/AdBlockManager.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSignal, QObject, QUrl, QFile

 from .AdBlockNetwork import AdBlockNetwork
 from .AdBlockPage import AdBlockPage
--- a/Helpviewer/AdBlock/AdBlockModel.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/AdBlock/AdBlockModel.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing a model for the AdBlock dialog.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt, QAbstractItemModel, QModelIndex

 import Helpviewer.HelpWindow
--- a/Helpviewer/AdBlock/AdBlockNetwork.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/AdBlock/AdBlockNetwork.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,7 @@
 Module implementing the network block class.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import QObject

 import Helpviewer.HelpWindow
--- a/Helpviewer/AdBlock/AdBlockPage.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/AdBlock/AdBlockPage.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,7 @@
 Module implementing a class to apply AdBlock rules to a web page.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import QObject
 from PyQt4 import QtWebKit

 import Helpviewer.HelpWindow
--- a/Helpviewer/AdBlock/AdBlockRule.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/AdBlock/AdBlockRule.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,7 +9,7 @@

 import re

-from PyQt4.QtCore import *
+from PyQt4.QtCore import Qt, QRegExp, QUrl


 class AdBlockRule(object):
--- a/Helpviewer/AdBlock/AdBlockSubscription.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/AdBlock/AdBlockSubscription.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,7 +9,8 @@

 import os

-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSignal, Qt, QObject, QByteArray, QDateTime, QUrl, \
+    QCryptographicHash, QFile, QIODevice, QTextStream
 from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply

 from E5Gui import E5MessageBox
--- a/Helpviewer/Bookmarks/AddBookmarkDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Bookmarks/AddBookmarkDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to add a bookmark or a bookmark folder.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QModelIndex
+from PyQt4.QtGui import QSortFilterProxyModel, QDialog, QTreeView

 import Helpviewer.HelpWindow
--- a/Helpviewer/Bookmarks/BookmarkNode.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Bookmarks/BookmarkNode.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,6 @@
 Module implementing the bookmark node.
 """

-from PyQt4.QtCore import *
-

 class BookmarkNode(object):
     """
--- a/Helpviewer/Bookmarks/BookmarksDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Bookmarks/BookmarksDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to manage bookmarks.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, QUrl, QModelIndex
+from PyQt4.QtGui import QDialog, QFontMetrics, QMenu, QCursor, QApplication

 from E5Gui.E5TreeSortFilterProxyModel import E5TreeSortFilterProxyModel
--- a/Helpviewer/Bookmarks/BookmarksManager.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Bookmarks/BookmarksManager.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,9 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, QT_TRANSLATE_NOOP, QObject, QFile, QByteArray, \
+    QBuffer, QIODevice, QXmlStreamReader, QDate, QFileInfo, QUrl
+from PyQt4.QtGui import QUndoStack, QUndoCommand, QApplication
 from PyQt4.QtWebKit import QWebPage

 from E5Gui import E5MessageBox, E5FileDialog
@@ -402,7 +403,7 @@
             E5MessageBox.critical(None,
                 self.trUtf8("Exporting Bookmarks"),
                 self.trUtf8("""Error exporting bookmarks to <b>{0}</b>.""")\
-                    .format(bookmarkFile))
+                    .format(fileName))

     def __convertFromOldBookmarks(self):
         """
--- a/Helpviewer/Bookmarks/BookmarksMenu.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Bookmarks/BookmarksMenu.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the bookmarks menu.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, QUrl
+from PyQt4.QtGui import QMenu, QCursor

 from E5Gui.E5ModelMenu import E5ModelMenu
--- a/Helpviewer/Bookmarks/BookmarksModel.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Bookmarks/BookmarksModel.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,8 @@
 Module implementing the bookmark model class.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import Qt, QAbstractItemModel, QModelIndex, QUrl, QByteArray, \
+    QDataStream, QIODevice, QBuffer, QMimeData

 from .BookmarkNode import BookmarkNode
 from .XbelWriter import XbelWriter
--- a/Helpviewer/Bookmarks/BookmarksToolBar.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Bookmarks/BookmarksToolBar.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a tool bar showing bookmarks.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, QUrl
+from PyQt4.QtGui import QMenu, QApplication, QCursor

 from E5Gui.E5ModelToolBar import E5ModelToolBar
--- a/Helpviewer/Bookmarks/XbelReader.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Bookmarks/XbelReader.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,8 @@
 Module implementing a class to read XBEL bookmark files.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import QXmlStreamReader, QXmlStreamEntityResolver, QIODevice, \
+    QFile, QCoreApplication

 from .BookmarkNode import BookmarkNode
--- a/Helpviewer/Bookmarks/XbelWriter.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Bookmarks/XbelWriter.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,7 @@
 Module implementing a class to write XBEL bookmark files.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import QXmlStreamWriter, QIODevice, QFile

 from .BookmarkNode import BookmarkNode
--- a/Helpviewer/CookieJar/CookieExceptionsModel.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/CookieJar/CookieExceptionsModel.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the cookie exceptions model.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt, QAbstractTableModel, QSize, QModelIndex
+from PyQt4.QtGui import QFont, QFontMetrics

 from .CookieJar import CookieJar
--- a/Helpviewer/CookieJar/CookieJar.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/CookieJar/CookieJar.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, QByteArray, QDataStream, QIODevice, QSettings, \
+    QDateTime
 from PyQt4.QtNetwork import QNetworkCookieJar, QNetworkCookie
 from PyQt4.QtWebKit import QWebSettings
--- a/Helpviewer/CookieJar/CookieModel.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/CookieJar/CookieModel.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the cookie model.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt, QAbstractTableModel, QSize, QModelIndex
+from PyQt4.QtGui import QFont, QFontMetrics


 class CookieModel(QAbstractTableModel):
--- a/Helpviewer/CookieJar/CookiesConfigurationDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/CookieJar/CookiesConfigurationDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the cookies configuration dialog.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog

 from .CookiesDialog import CookiesDialog
 from .CookiesExceptionsDialog import CookiesExceptionsDialog
--- a/Helpviewer/CookieJar/CookiesDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/CookieJar/CookiesDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show all cookies.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot, Qt, QDateTime, QByteArray
+from PyQt4.QtGui import QDialog, QFont, QFontMetrics, QSortFilterProxyModel

 from .CookieModel import CookieModel
 from .CookieDetailsDialog import CookieDetailsDialog
--- a/Helpviewer/CookieJar/CookiesExceptionsDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/CookieJar/CookiesExceptionsDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog for the configuration of cookie exceptions.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog, QSortFilterProxyModel, QCompleter, QFont, QFontMetrics

 from .CookieJar import CookieJar
 from .CookieExceptionsModel import CookieExceptionsModel
--- a/Helpviewer/Download/DownloadItem.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Download/DownloadItem.py	Sun Jun 05 18:25:36 2011 +0200
@@ -534,9 +534,9 @@
         else:
             if self.__bytesReceived == bytesTotal or bytesTotal == -1:
                 info = self.trUtf8("{0} downloaded\nSHA1: {1}\nMD5: {2}")\
-                    .format(dataString(self.__output.size()),
-                            str(self.__sha1Hash.result().toHex(), encoding = "ascii"),
-                            str(self.__md5Hash.result().toHex(), encoding = "ascii"))
+                    .format(dataString(self.__output.size()),
+                            str(self.__sha1Hash.result().toHex(), encoding="ascii"),
+                            str(self.__md5Hash.result().toHex(), encoding="ascii"))
             else:
                 info = self.trUtf8("{0} of {1} - Stopped")\
                     .format(dataString(self.__bytesReceived),
--- a/Helpviewer/HelpBrowserWV.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/HelpBrowserWV.py	Sun Jun 05 18:25:36 2011 +0200
@@ -8,8 +8,11 @@
 Module implementing the helpbrowser using QWebView.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot, pyqtSignal, QObject, QT_TRANSLATE_NOOP, QUrl, \
+    QBuffer, QIODevice, QByteArray, QFileInfo, Qt, QTimer, QEvent, QRect
+from PyQt4.QtGui import qApp, QDesktopServices, QStyle, QMenu, QApplication, \
+    QInputDialog, QLineEdit, QClipboard, QMouseEvent, QLabel, QToolTip, QColor, \
+    QPalette, QFrame
 from PyQt4 import QtWebKit
 from PyQt4.QtWebKit import QWebView, QWebPage, QWebSettings
 try:
--- a/Helpviewer/HelpDocsInstaller.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/HelpDocsInstaller.py	Sun Jun 05 18:25:36 2011 +0200
@@ -8,8 +8,8 @@
 documentation database.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, QThread, qVersion, Qt, QMutex, QDateTime, QDir, \
+    QLibraryInfo, QFileInfo
 from PyQt4.QtHelp import QHelpEngineCore

 from eric5config import getConfig
--- a/Helpviewer/HelpIndexWidget.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/HelpIndexWidget.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a window for showing the QtHelp index.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, QUrl, QEvent
+from PyQt4.QtGui import QWidget, QVBoxLayout, QLabel, QLineEdit, QMenu, QDialog

 from .HelpTopicDialog import HelpTopicDialog
--- a/Helpviewer/HelpLanguagesDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/HelpLanguagesDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to configure the preferred languages.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot, QByteArray, QLocale
+from PyQt4.QtGui import QDialog, QStringListModel

 from .Ui_HelpLanguagesDialog import Ui_HelpLanguagesDialog
--- a/Helpviewer/HelpSearchWidget.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/HelpSearchWidget.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a window for showing the QtHelp index.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, QEvent, QUrl
+from PyQt4.QtGui import QWidget, QVBoxLayout, QTextBrowser, QApplication, QMenu


 class HelpSearchWidget(QWidget):
--- a/Helpviewer/HelpTocWidget.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/HelpTocWidget.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a window for showing the QtHelp TOC.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, QEvent, QUrl
+from PyQt4.QtGui import QWidget, QVBoxLayout, QMenu


 class HelpTocWidget(QWidget):
--- a/Helpviewer/HelpWebSearchWidget.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/HelpWebSearchWidget.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,9 @@
 Module implementing a web search widget for the web browser.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, QUrl, QModelIndex, QTimer
+from PyQt4.QtGui import QWidget, QMenu, QHBoxLayout, QStandardItem, QStandardItemModel, \
+    QCompleter, QFont, QIcon, QPixmap
 from PyQt4.QtWebKit import QWebSettings

 import UI.PixmapCache
--- a/Helpviewer/HelpWindow.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/HelpWindow.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,12 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, QUrl, \
+    QThread, QTextCodec
+from PyQt4.QtGui import QMainWindow, QWidget, QVBoxLayout, QSizePolicy, QDockWidget, \
+    QDesktopServices, QKeySequence, qApp, QComboBox, QFont, QFontMetrics, QLabel, \
+    QSplitter, QMenu, QToolButton, QLineEdit, QApplication, QWhatsThis, QDialog, \
+    QHBoxLayout, QProgressBar, QAction, QIcon
 from PyQt4.QtWebKit import QWebSettings, QWebDatabase, QWebSecurityOrigin
 from PyQt4.QtHelp import QHelpEngine, QHelpEngineCore, QHelpSearchQuery

@@ -910,7 +914,8 @@
             """<p>Opens a dialog to configure offline storage.</p>"""
         ))
         if not self.initShortcutsOnly:
-            self.offlineStorageAct.triggered[()].connect(self.__showOfflineStorageConfiguration)
+            self.offlineStorageAct.triggered[()].connect(
+                self.__showOfflineStorageConfiguration)
         self.__actions.append(self.offlineStorageAct)

         self.syncTocAct = E5Action(self.trUtf8('Sync with Table of Contents'),
@@ -976,7 +981,8 @@
                 """<p>Shows a dialog to manage the QtHelp documentation set.</p>"""
         ))
         if not self.initShortcutsOnly:
-            self.manageQtHelpDocsAct.triggered[()].connect(self.__manageQtHelpDocumentation)
+            self.manageQtHelpDocsAct.triggered[()].connect(
+                self.__manageQtHelpDocumentation)
         self.__actions.append(self.manageQtHelpDocsAct)

         self.manageQtHelpFiltersAct = E5Action(self.trUtf8('Manage QtHelp Filters'),
@@ -1044,7 +1050,8 @@
                 """<p>Opens a dialog to configure the available search engines.</p>"""
         ))
         if not self.initShortcutsOnly:
-            self.searchEnginesAct.triggered[()].connect(self.__showEnginesConfigurationDialog)
+            self.searchEnginesAct.triggered[()].connect(
+                self.__showEnginesConfigurationDialog)
         self.__actions.append(self.searchEnginesAct)

         self.passwordsAct = E5Action(self.trUtf8('Manage Saved Passwords'),
--- a/Helpviewer/History/HistoryCompleter.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/History/HistoryCompleter.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,9 @@
 Module implementing a special completer for the history.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt, QRegExp, QTimer
+from PyQt4.QtGui import QTableView, QAbstractItemView, QSortFilterProxyModel, \
+    QCompleter

 from .HistoryModel import HistoryModel
 from .HistoryFilterModel import HistoryFilterModel
--- a/Helpviewer/History/HistoryDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/History/HistoryDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to manage history.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, QUrl
+from PyQt4.QtGui import QDialog, QFontMetrics, QMenu, QCursor, QApplication

 from E5Gui.E5TreeSortFilterProxyModel import E5TreeSortFilterProxyModel
--- a/Helpviewer/History/HistoryFilterModel.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/History/HistoryFilterModel.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,7 @@
 Module implementing the history filter model.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import Qt, QDateTime, QModelIndex
 from PyQt4.QtGui import QAbstractProxyModel

 from .HistoryModel import HistoryModel
--- a/Helpviewer/History/HistoryManager.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/History/HistoryManager.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the history manager.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, QFileInfo, QDateTime, QDate, QTime, QUrl, QTimer, \
+    QFile, QIODevice, QByteArray, QDataStream, QTemporaryFile
 from PyQt4.QtWebKit import QWebHistoryInterface, QWebSettings

 from E5Gui import E5MessageBox
--- a/Helpviewer/History/HistoryMenu.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/History/HistoryMenu.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,10 +9,11 @@

 import sys

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, QMimeData, QUrl, QModelIndex
+from PyQt4.QtGui import QAbstractProxyModel

 from E5Gui.E5ModelMenu import E5ModelMenu
+from E5Gui import E5MessageBox

 import Helpviewer.HelpWindow
--- a/Helpviewer/History/HistoryModel.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/History/HistoryModel.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,7 @@
 Module implementing the history model.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import Qt, QAbstractTableModel, QModelIndex, QUrl

 import Helpviewer.HelpWindow
--- a/Helpviewer/History/HistoryTreeModel.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/History/HistoryTreeModel.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,7 +9,7 @@

 import bisect

-from PyQt4.QtCore import *
+from PyQt4.QtCore import Qt, QModelIndex, QDate
 from PyQt4.QtGui import QAbstractProxyModel

 from .HistoryModel import HistoryModel
--- a/Helpviewer/Network/NetworkAccessManager.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Network/NetworkAccessManager.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSignal, QByteArray
 from PyQt4.QtGui import QDialog
 from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
 try:
--- a/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,7 @@
 Module implementing a QNetworkReply subclass reporting an unknown protocol error.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import QTimer
 from PyQt4.QtNetwork import QNetworkReply
--- a/Helpviewer/Network/NetworkReply.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Network/NetworkReply.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,7 @@
 Module implementing a network reply object for special data.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import QTimer, QIODevice, QByteArray
 from PyQt4.QtNetwork import QNetworkReply, QNetworkRequest
--- a/Helpviewer/OpenSearch/OpenSearchEngine.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchEngine.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,9 @@
 import re
 import json

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, pyqtSlot, QLocale, QUrl, QByteArray, QBuffer, \
+    QIODevice, QObject
+from PyQt4.QtGui import QImage
 from PyQt4.QtNetwork import QNetworkRequest, QNetworkAccessManager

 from UI.Info import Program
--- a/Helpviewer/OpenSearch/OpenSearchEngineModel.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchEngineModel.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,7 +9,7 @@

 import re

-from PyQt4.QtCore import *
+from PyQt4.QtCore import Qt, QUrl, QAbstractTableModel, QModelIndex
 from PyQt4.QtGui import QPixmap, QIcon
--- a/Helpviewer/OpenSearch/OpenSearchManager.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchManager.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,7 +9,8 @@

 import os

-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSignal, QObject, QUrl, QFile, QDir, QIODevice, QByteArray, \
+    QBuffer
 from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply

 from .OpenSearchDefaultEngines import OpenSearchDefaultEngines
--- a/Helpviewer/OpenSearch/OpenSearchReader.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchReader.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,7 @@
 Module implementing a reader for open search engine descriptions.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import QXmlStreamReader, QIODevice, QCoreApplication

 from .OpenSearchEngine import OpenSearchEngine
--- a/Helpviewer/OpenSearch/OpenSearchWriter.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchWriter.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,7 @@
 Module implementing a writer for open search engine descriptions.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import QXmlStreamWriter, QIODevice


 class OpenSearchWriter(QXmlStreamWriter):
--- a/Helpviewer/Passwords/PasswordManager.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Passwords/PasswordManager.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,9 +9,9 @@

 import os

-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSignal, QObject, QByteArray, QUrl
 from PyQt4.QtNetwork import QNetworkRequest
-from PyQt4.QtWebKit import *
+from PyQt4.QtWebKit import QWebSettings, QWebPage

 from E5Gui import E5MessageBox
--- a/Helpviewer/Passwords/PasswordModel.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Passwords/PasswordModel.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,7 @@
 Module implementing a model for password management.
 """

-from PyQt4.QtCore import *
+from PyQt4.QtCore import Qt, QModelIndex, QAbstractTableModel


 class PasswordModel(QAbstractTableModel):
--- a/Helpviewer/Passwords/PasswordsDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/Passwords/PasswordsDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show all saved logins.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot, QFont, QFontMetrics, QSortFilterProxyModel
+from PyQt4.QtGui import QDialog

 from E5Gui import E5MessageBox
--- a/Helpviewer/QtHelpDocumentationDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/QtHelpDocumentationDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to manage the QtHelp documentation database.
 """

-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSlot, Qt
+from PyQt4.QtGui import QDialog, QItemSelectionModel
 from PyQt4.QtHelp import QHelpEngineCore

 from E5Gui import E5MessageBox, E5FileDialog
--- a/Helpviewer/QtHelpFiltersDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/QtHelpFiltersDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to manage the QtHelp filters.
 """

-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSlot, Qt
+from PyQt4.QtGui import QDialog, QTreeWidgetItem, QListWidgetItem, QInputDialog, QLineEdit
 from PyQt4.QtHelp import QHelpEngineCore

 from .Ui_QtHelpFiltersDialog import Ui_QtHelpFiltersDialog
--- a/Helpviewer/SearchWidget.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Helpviewer/SearchWidget.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the search bar for the web browser.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot, Qt
+from PyQt4.QtGui import QWidget, QPalette, QBrush, QColor
 from PyQt4.QtWebKit import QWebPage

 from .Ui_SearchWidget import Ui_SearchWidget
--- a/IconEditor/IconEditorGrid.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/IconEditor/IconEditorGrid.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,9 @@
 Module implementing the icon editor grid.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, QPoint, QRect, QSize
+from PyQt4.QtGui import QUndoCommand, QImage, QWidget, QColor, QPixmap, QSizePolicy, \
+    QUndoStack, qRgba, QPainter, QApplication, QCursor, QBrush, QDialog, qGray, qAlpha

 from E5Gui import E5MessageBox
--- a/IconEditor/IconEditorPalette.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/IconEditor/IconEditorPalette.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,10 @@
 Module implementing a palette widget for the icon editor.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt
+from PyQt4.QtGui import QWidget, QColor, QPainter, QBoxLayout, QLabel, QFrame, \
+    QPushButton, QSpinBox, QGroupBox, QVBoxLayout, QRadioButton, QSpacerItem, \
+    QSizePolicy, QPixmap, QColorDialog


 class IconEditorPalette(QWidget):
--- a/IconEditor/IconEditorWindow.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/IconEditor/IconEditorWindow.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,9 @@
 Module implementing the icon editor main window.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, QSize, QSignalMapper, QFileInfo, QFile
+from PyQt4.QtGui import QMainWindow, QScrollArea, QPalette, QImage, QImageReader, \
+    QImageWriter, QKeySequence, qApp, QLabel, QDockWidget, QDialog, QWhatsThis

 from E5Gui.E5Action import E5Action, createActionGroup
 from E5Gui import E5FileDialog, E5MessageBox
--- a/MultiProject/AddProjectDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/MultiProject/AddProjectDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the add project dialog.
 """

-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from E5Gui.E5Completers import E5FileCompleter
 from E5Gui import E5FileDialog
--- a/MultiProject/MultiProject.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/MultiProject/MultiProject.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, QFileInfo, QFile, QIODevice, QObject
+from PyQt4.QtGui import QMenu, QApplication, QDialog, QCursor, QToolBar

 from Globals import recentNameMultiProject

@@ -475,7 +475,7 @@
                 res = E5MessageBox.yesNo(self.parent(),
                     self.trUtf8("Save File"),
                     self.trUtf8("<p>The file <b>{0}</b> already exists."
-                                " Overwrite it?</p>").format(fileName),
+                                " Overwrite it?</p>").format(fn),
                     icon=E5MessageBox.Warning)
                 if not res:
                     return False
--- a/MultiProject/MultiProjectBrowser.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/MultiProject/MultiProjectBrowser.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the multi project browser.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt
+from PyQt4.QtGui import QListWidget, QListWidgetItem, QDialog, QMenu

 from E5Gui.E5Application import e5App
--- a/PluginManager/PluginInstallDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/PluginManager/PluginInstallDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -14,8 +14,9 @@
 import compileall
 import urllib.parse

-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSlot, Qt, QDir, QFileInfo
+from PyQt4.QtGui import QWidget, QDialogButtonBox, QAbstractButton, QApplication, \
+    QDialog, QVBoxLayout, QMainWindow

 from E5Gui import E5FileDialog
--- a/PluginManager/PluginManager.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/PluginManager/PluginManager.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,12 +11,13 @@
 import sys
 import imp

-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSignal, QObject
 from PyQt4.QtGui import QPixmap

 from E5Gui import E5MessageBox

-from .PluginExceptions import *
+from .PluginExceptions import PluginPathError, PluginModulesError, PluginLoadError, \
+    PluginActivationError, PluginModuleFormatError, PluginClassFormatError

 import UI.PixmapCache

@@ -733,7 +734,8 @@
         pluginDict = {}

         for name, module in \
-            list(self.__onDemandActiveModules.items()) + list(self.__onDemandInactiveModules.items()):
+            list(self.__onDemandActiveModules.items()) + \
+            list(self.__onDemandInactiveModules.items()):
             if getattr(module, "pluginType") == type_ and \
                getattr(module, "error", "") == "":
                 plugin_name = getattr(module, "pluginTypename")
@@ -758,7 +760,8 @@
         @return preview pixmap (QPixmap)
         """
         for modname, module in \
-            list(self.__onDemandActiveModules.items()) + list(self.__onDemandInactiveModules.items()):
+            list(self.__onDemandActiveModules.items()) + \
+            list(self.__onDemandInactiveModules.items()):
             if getattr(module, "pluginType") == type_ and \
                getattr(module, "pluginTypename") == name:
                 if hasattr(module, "previewPix"):
@@ -911,7 +914,8 @@
         vcsDict = {}

         for name, module in \
-            list(self.__onDemandActiveModules.items()) + list(self.__onDemandInactiveModules.items()):
+            list(self.__onDemandActiveModules.items()) + \
+            list(self.__onDemandInactiveModules.items()):
             if getattr(module, "pluginType") == "version_control":
                 if hasattr(module, "getVcsSystemIndicator"):
                     res = module.getVcsSystemIndicator()
--- a/PluginManager/PluginRepositoryDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/PluginManager/PluginRepositoryDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -12,8 +12,9 @@
 import os
 import zipfile

-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSignal, pyqtSlot, Qt, QFile, QIODevice, QUrl, QProcess
+from PyQt4.QtGui import QWidget, QDialogButtonBox, QAbstractButton, QTreeWidgetItem, \
+    QDialog, QVBoxLayout, QMainWindow
 from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
 try:
     from PyQt4.QtNetwork import QSslError   # __IGNORE_WARNING__
--- a/PluginManager/PluginUninstallDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/PluginManager/PluginUninstallDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -12,8 +12,8 @@
 import imp
 import shutil

-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QWidget, QDialog, QDialogButtonBox, QVBoxLayout, QMainWindow

 from E5Gui import E5MessageBox
--- a/Plugins/AboutPlugin/AboutDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/AboutPlugin/AboutDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,14 +7,17 @@
 Module implementing an 'About Eric' dialog.
 """

-from PyQt4.QtGui import QApplication
+from PyQt4.QtGui import QApplication, QDialog

-from UI.Info import *
+from .Ui_AboutDialog import Ui_AboutDialog

 import Utilities

+import UI.PixmapCache
+import UI.Info

-titleText = "<b>{0} - {1}</b>".format(Program, Version)
+
+titleText = "<b>{0} - {1}</b>".format(UI.Info.Program, UI.Info.Version)

 aboutText = QApplication.translate("AboutDialog",
     """<p>{0} is an Integrated Development Environment for the Python"""
@@ -28,7 +31,7 @@
     """<p>{0} uses third party software which is copyrighted"""
     """ by it's respective copyright holder. For details see"""
     """ the copyright notice of the individual package.</p>"""
-).format(Program, Homepage, BugAddress, FeatureAddress)
+).format(UI.Info.Program, UI.Info.Homepage, UI.Info.BugAddress, UI.Info.FeatureAddress)

 authorsText = \
 """\
@@ -719,15 +722,7 @@
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.

-                     END OF TERMS AND CONDITIONS""".format(Copyright)
-
-
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
-
-import UI.PixmapCache
-
-from .Ui_AboutDialog import Ui_AboutDialog
+                     END OF TERMS AND CONDITIONS""".format(UI.Info.Copyright)


 class AboutDialog(QDialog, Ui_AboutDialog):
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,9 @@
 import os
 import fnmatch

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot, Qt
+from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem, QApplication, \
+    QHeaderView

 from E5Gui.E5Application import e5App
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,9 @@
 import os
 import fnmatch

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot, Qt, QProcess
+from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem, QApplication, \
+    QHeaderView

 from E5Gui.E5Application import e5App
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,8 @@
 import os
 import copy

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot, Qt
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os.path

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QProcess, QTimer
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from E5Gui import E5MessageBox
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,8 @@
 import os
 import copy

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog, QDialogButtonBox, QColorDialog, QColor

 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os.path

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QProcess, QTimer
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from E5Gui import E5MessageBox
--- a/Plugins/PluginAbout.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/PluginAbout.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,7 +9,7 @@

 from PyQt4.QtCore import QObject

-from UI.Info import *
+import UI.Info
 import UI.PixmapCache

 from E5Gui.E5Action import E5Action
@@ -74,15 +74,15 @@
         """
         acts = []

-        self.aboutAct = E5Action(self.trUtf8('About {0}').format(Program),
+        self.aboutAct = E5Action(self.trUtf8('About {0}').format(UI.Info.Program),
                 UI.PixmapCache.getIcon("helpAbout.png"),
-                self.trUtf8('&About {0}').format(Program),
+                self.trUtf8('&About {0}').format(UI.Info.Program),
                 0, 0, self, 'about_eric')
         self.aboutAct.setStatusTip(self.trUtf8('Display information about this software'))
         self.aboutAct.setWhatsThis(self.trUtf8(
             """<b>About {0}</b>"""
             """<p>Display some information about this software.</p>"""
-                             ).format(Program))
+                             ).format(UI.Info.Program))
         self.aboutAct.triggered[()].connect(self.__about)
         acts.append(self.aboutAct)

@@ -125,4 +125,4 @@
         """
         Private slot to handle the About Qt dialog.
         """
-        E5MessageBox.aboutQt(self.__ui, Program)
+        E5MessageBox.aboutQt(self.__ui, UI.Info.Program)
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -152,7 +152,7 @@
         return (
             rev,
             self.nocommitCheckBox.isChecked(),
-            self.messageEdit.toPlainText(),
+            self.messageEdit.toPlainText(),
             self.keyEdit.text(),
             self.localCheckBox.isChecked(),
             self.forceCheckBox.isChecked()
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Sun Jun 05 18:25:36 2011 +0200
@@ -6,13 +6,11 @@
 """
 Module implementing the VCS project browser helper for subversion.
 """
-
 import os

 import pysvn

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QMenu

 from E5Gui.E5Application import e5App
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,9 +9,6 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
-
 from E5Gui.E5Application import e5App

 from VCS.ProjectHelper import VcsProjectHelper
--- a/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,8 @@

 import pysvn

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QMutexLocker, Qt
+from PyQt4.QtGui import QHeaderView, QDialog, QDialogButtonBox, QFont, QTreeWidgetItem

 from .SvnDialogMixin import SvnDialogMixin
 from .Ui_SvnBlameDialog import Ui_SvnBlameDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the Subversion command dialog.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import pysvn

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, pyqtSlot
+from PyQt4.QtGui import QWidget, QDialogButtonBox

 from .Ui_SvnCommitDialog import Ui_SvnCommitDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os.path

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,7 @@

 import pysvn

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog, QApplication, QDialogButtonBox

 from .SvnConst import svnNotifyActionMap
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,9 @@

 import pysvn

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QMutexLocker, QFileInfo, QDateTime, Qt, pyqtSlot
+from PyQt4.QtGui import QWidget, QColor, QCursor, QBrush, QApplication, QTextCursor, \
+    QDialogButtonBox

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,8 @@

 import pysvn

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QMutexLocker
+from PyQt4.QtGui import QDialog, QApplication

 from .SvnUtilities import formatTime
 from .SvnDialogMixin import SvnDialogMixin
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,9 @@

 import pysvn

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QMutexLocker, QDate, QRegExp, Qt, pyqtSlot
+from PyQt4.QtGui import QCursor, QHeaderView, QDialog, QApplication, QDialogButtonBox, \
+    QTreeWidgetItem

 from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,8 @@

 import pysvn

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QMutexLocker, QByteArray, QUrl, Qt
+from PyQt4.QtGui import QWidget, QCursor, QApplication, QTextCursor, QDialogButtonBox

 from .SvnUtilities import formatTime
--- a/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a merge operation.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QRegExp
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing a dialog to enter the data for a new property.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from .Ui_SvnPropDelDialog import Ui_SvnPropDelDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,9 @@

 import pysvn

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QMutexLocker, Qt
+from PyQt4.QtGui import QWidget, QHeaderView, QApplication, QDialogButtonBox, \
+    QTreeWidgetItem

 from .SvnDialogMixin import SvnDialogMixin
 from .Ui_SvnPropListDialog import Ui_SvnPropListDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing a dialog to enter the data for a new property.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog

 from .Ui_SvnPropSetDialog import Ui_SvnPropSetDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing a dialog to enter the data to relocate the workspace.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog

 from .Ui_SvnRelocateDialog import Ui_SvnRelocateDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,9 @@

 import pysvn

-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from PyQt4.QtCore import QMutexLocker, Qt, pyqtSlot
+from PyQt4.QtGui import QCursor, QHeaderView, QDialog, QApplication, QDialogButtonBox, \
+    QTreeWidgetItem

 from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the revisions for the svn diff command.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QDate, QDateTime, Qt
+from PyQt4.QtGui import QDialog

 from .Ui_SvnRevisionSelectionDialog import Ui_SvnRevisionSelectionDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -12,8 +12,9 @@

 import pysvn

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QMutexLocker, Qt, pyqtSlot
+from PyQt4.QtGui import QWidget, QCursor, QHeaderView, QApplication, QMenu, \
+    QDialogButtonBox, QTreeWidgetItem

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing a dialog to enter the data for a switch operation.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog

 from .Ui_SvnSwitchDialog import Ui_SvnSwitchDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,9 @@

 import pysvn

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QMutexLocker, QRegExp, Qt
+from PyQt4.QtGui import QHeaderView, QLineEdit, QDialog, QInputDialog, QApplication, \
+    QDialogButtonBox, QTreeWidgetItem

 from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a tagging operation.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from .Ui_SvnTagDialog import Ui_SvnTagDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the URLs for the svn diff command.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QRegExp, pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
@@ -17,6 +17,8 @@

 from .Ui_SvnUrlSelectionDialog import Ui_SvnUrlSelectionDialog

+import Utilities
+

 class SvnUrlSelectionDialog(QDialog, Ui_SvnUrlSelectionDialog):
     """
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sun Jun 05 18:25:36 2011 +0200
@@ -14,8 +14,8 @@
 import urllib.error
 import time

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QMutexLocker, pyqtSignal, QRegExp
+from PyQt4.QtGui import QLineEdit, QDialog, QInputDialog, QApplication

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Sun Jun 05 18:25:36 2011 +0200
@@ -8,9 +8,7 @@
 """

 import os
-
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QMenu

 from E5Gui.E5Application import e5App
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,9 +9,6 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
-
 from E5Gui.E5Application import e5App

 from VCS.ProjectHelper import VcsProjectHelper
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,11 @@
 Module implementing a dialog to show the output of the svn blame command.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+import os
+
+from PyQt4.QtCore import QTimer, QProcess, Qt, pyqtSlot
+from PyQt4.QtGui import QHeaderView, QLineEdit, QDialog, QDialogButtonBox, QFont, \
+    QTreeWidgetItem

 from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the Subversion command dialog.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the commit message.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, pyqtSlot
+from PyQt4.QtGui import QWidget, QDialogButtonBox

 from .Ui_SvnCommitDialog import Ui_SvnCommitDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os.path

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QTimer, QProcess, pyqtSlot
+from PyQt4.QtGui import QLineEdit, QDialog, QDialogButtonBox

 from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QTimer, QFileInfo, QProcess, pyqtSlot
+from PyQt4.QtGui import QWidget, QColor, QLineEdit, QBrush, QTextCursor, QDialogButtonBox

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,9 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QTimer, QDate, QProcess, QRegExp, Qt, pyqtSlot
+from PyQt4.QtGui import QWidget, QCursor, QHeaderView, QLineEdit, QDialog, \
+    QApplication, QDialogButtonBox, QTreeWidgetItem

 from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QTimer, QByteArray, QProcess, QRegExp, QUrl, pyqtSlot
+from PyQt4.QtGui import QWidget, QLineEdit, QApplication, QTextCursor, QDialogButtonBox

 from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a merge operation.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QRegExp
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show the output of the svn proplist command process.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QTimer, QProcess, QRegExp, Qt
+from PyQt4.QtGui import QWidget, QHeaderView, QDialogButtonBox, QTreeWidgetItem

 from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a new property.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Completers import E5FileCompleter
 from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing a dialog to enter the data to relocate the workspace.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog

 from .Ui_SvnRelocateDialog import Ui_SvnRelocateDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,9 @@

 import os

-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from PyQt4.QtGui import QWidget, QCursor, QHeaderView, QLineEdit, QDialog, \
+    QApplication, QDialogButtonBox, QTreeWidgetItem
+from PyQt4.QtCore import QTimer, QProcess, QRegExp, Qt, pyqtSlot

 from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the revisions for the svn diff command.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QDate, QDateTime, Qt
+from PyQt4.QtGui import QDialog

 from .Ui_SvnRevisionSelectionDialog import Ui_SvnRevisionSelectionDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,9 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QTimer, QProcess, QRegExp, Qt, pyqtSlot
+from PyQt4.QtGui import QWidget, QHeaderView, QLineEdit, QApplication, QMenu, \
+    QDialogButtonBox, QTreeWidgetItem

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing a dialog to enter the data for a switch operation.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog

 from .Ui_SvnSwitchDialog import Ui_SvnSwitchDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,11 @@
 Module implementing a dialog to show a list of tags or branches.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+import os
+
+from PyQt4.QtCore import QTimer, QProcess, QRegExp, Qt, pyqtSlot
+from PyQt4.QtGui import QHeaderView, QLineEdit, QDialog, QInputDialog, \
+    QDialogButtonBox, QTreeWidgetItem

 from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing a dialog to enter the data for a tagging operation.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from .Ui_SvnTagDialog import Ui_SvnTagDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,14 +7,16 @@
 Module implementing a dialog to enter the URLs for the svn diff command.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QRegExp, pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox

 from .Ui_SvnUrlSelectionDialog import Ui_SvnUrlSelectionDialog

+import Utilities
+

 class SvnUrlSelectionDialog(QDialog, Ui_SvnUrlSelectionDialog):
     """
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sun Jun 05 18:25:36 2011 +0200
@@ -13,8 +13,8 @@
 import urllib.parse
 import urllib.error

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, QProcess, QRegExp
+from PyQt4.QtGui import QLineEdit, QDialog, QInputDialog, QApplication

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,9 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, QFileInfo, QEvent, Qt
+from PyQt4.QtGui import QStackedWidget, QSplitter, QListWidget, QListWidgetItem, \
+    QSizePolicy, QMenu

 from ViewManager.ViewManager import ViewManager
--- a/Plugins/ViewManagerPlugins/MdiArea/MdiArea.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/ViewManagerPlugins/MdiArea/MdiArea.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the mdi area viewmanager class.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QSignalMapper, pyqtSignal, QEvent, QSize, Qt
+from PyQt4.QtGui import QWidget, QMdiArea, QMenu

 from ViewManager.ViewManager import ViewManager
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,9 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QPoint, QFileInfo, pyqtSignal, QEvent, QByteArray, QMimeData, Qt
+from PyQt4.QtGui import QWidget, QColor, QHBoxLayout, QDrag, QPixmap, QSplitter, \
+    QTabBar, QApplication, QToolButton, QMenu, QLabel

 from E5Gui.E5Application import e5App
--- a/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import qVersion, pyqtSlot
+from PyQt4.QtGui import QColor, QColorDialog, QDialog, qRgba, QDialogButtonBox

 from E5Gui import E5MessageBox
--- a/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog, QDialogButtonBox, QFileDialog

 from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
--- a/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog, QDialogButtonBox, QFontDialog

 from .Ui_FontDialogWizardDialog import Ui_FontDialogWizardDialog
--- a/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,9 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QLineEdit, QDoubleValidator, QDialog, QInputDialog, \
+    QDialogButtonBox

 from .Ui_InputDialogWizardDialog import Ui_InputDialogWizardDialog
--- a/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QMessageBox, QDialog, QDialogButtonBox

 from .Ui_MessageBoxWizardDialog import Ui_MessageBoxWizardDialog
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,9 @@
 Module implementing a dialog for entering character classes.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QRegExp
+from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QLineEdit, \
+    QPushButton, QDialog, QScrollArea, QComboBox, QVBoxLayout, QRegExpValidator, QLabel

 from .Ui_PyRegExpWizardCharactersDialog import Ui_PyRegExpWizardCharactersDialog
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,9 @@
 import os
 import re

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QFileInfo, pyqtSlot
+from PyQt4.QtGui import QWidget, QDialog, QInputDialog, QApplication, QClipboard, \
+    QTextCursor, QDialogButtonBox, QMainWindow, QVBoxLayout, QTableWidgetItem

 from E5Gui import E5MessageBox, E5FileDialog
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog for entering repeat counts.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog

 from .Ui_PyRegExpWizardRepeatDialog import Ui_PyRegExpWizardRepeatDialog
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,9 @@
 Module implementing a dialog for entering character classes.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QRegExp
+from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QLineEdit, \
+    QPushButton, QDialog, QScrollArea, QComboBox, QVBoxLayout, QRegExpValidator, QLabel

 from .Ui_QRegExpWizardCharactersDialog import Ui_QRegExpWizardCharactersDialog
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,9 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QFileInfo, QRegExp, Qt, pyqtSlot
+from PyQt4.QtGui import QWidget, QDialog, QApplication, QClipboard, QTextCursor, \
+    QDialogButtonBox, QMainWindow, QVBoxLayout, QTableWidgetItem

 from E5Gui import E5MessageBox, E5FileDialog
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardRepeatDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardRepeatDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog for entering repeat counts.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog

 from .Ui_QRegExpWizardRepeatDialog import Ui_QRegExpWizardRepeatDialog
--- a/Preferences/ConfigurationDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Preferences/ConfigurationDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,10 @@
 import os
 import types

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QMetaObject, pyqtSignal, Qt, QRect, pyqtSlot
+from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QPixmap, QTreeWidget, \
+    QStackedWidget, QDialog, QSplitter, QScrollArea, QApplication, QDialogButtonBox, \
+    QFrame, QMainWindow, QVBoxLayout, QTreeWidgetItem, QLabel

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,9 +9,9 @@

 import socket

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
-from PyQt4.QtNetwork import *
+from PyQt4.QtCore import QRegExp, pyqtSlot
+from PyQt4.QtGui import QLineEdit, QInputDialog
+from PyQt4.QtNetwork import QNetworkInterface, QAbstractSocket, QHostAddress

 from E5Gui.E5Application import e5App
 from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
--- a/Preferences/PreferencesLexer.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Preferences/PreferencesLexer.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,7 +7,6 @@
 Module implementing a special QextScintilla lexer to handle the preferences.
 """

-from PyQt4.QtCore import *
 from PyQt4.QtGui import QColor, QFont, QApplication
 from PyQt4.Qsci import QsciLexer
--- a/Preferences/ShortcutDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Preferences/ShortcutDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog for the configuration of a keyboard shortcut.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, QEvent, Qt
+from PyQt4.QtGui import QKeySequence, QDialog, QDialogButtonBox

 from .Ui_ShortcutDialog import Ui_ShortcutDialog
--- a/Preferences/Shortcuts.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Preferences/Shortcuts.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing functions dealing with keyboard shortcuts.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QFile, QIODevice
+from PyQt4.QtGui import QKeySequence, QApplication

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/Preferences/ShortcutsDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Preferences/ShortcutsDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog for the configuration of eric5s keyboard shortcuts.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, QRegExp, Qt, pyqtSlot
+from PyQt4.QtGui import QKeySequence, QHeaderView, QDialog, QTreeWidgetItem

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/Preferences/ToolConfigurationDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Preferences/ToolConfigurationDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import copy

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt, pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Completers import E5FileCompleter
 from E5Gui import E5MessageBox, E5FileDialog
--- a/Preferences/ToolGroupConfigurationDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Preferences/ToolGroupConfigurationDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import copy

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt, pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui import E5MessageBox
--- a/Preferences/ViewProfileDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Preferences/ViewProfileDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing a dialog to configure the various view profiles.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog

 from .Ui_ViewProfileDialog import Ui_ViewProfileDialog
 from .Ui_ViewProfileToolboxesDialog import Ui_ViewProfileToolboxesDialog
--- a/Preferences/__init__.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Preferences/__init__.py	Sun Jun 05 18:25:36 2011 +0200
@@ -1932,7 +1932,7 @@
     elif key in ["HelpViewerType", "DiskCacheSize", "AcceptCookies",
                  "KeepCookiesUntil", "StartupBehavior", "HistoryLimit",
                  "OfflineStorageDatabaseQuota", "OfflineWebApplicationCacheQuota",
-                 "CachePolicy", "DownloadManagerRemovePolicy",
+                 "CachePolicy", "DownloadManagerRemovePolicy",
                  "SearchLanguage"]:
         return int(prefClass.settings.value("Help/" + key,
             prefClass.helpDefaults[key]))
--- a/Project/AddDirectoryDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/AddDirectoryDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to add files of a directory to the project.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Project/AddFileDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/AddFileDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Project/AddFoundFilesDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/AddFoundFilesDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show the found files to the user.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from .Ui_AddFoundFilesDialog import Ui_AddFoundFilesDialog
--- a/Project/AddLanguageDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/AddLanguageDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing a dialog to add a new language to the project.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog

 from .Ui_AddLanguageDialog import Ui_AddLanguageDialog
--- a/Project/CreateDialogCodeDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/CreateDialogCodeDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,9 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QMetaObject, QByteArray, QRegExp, Qt, pyqtSlot, QMetaMethod
+from PyQt4.QtGui import QWidget, QSortFilterProxyModel, QStandardItemModel, QDialog, \
+    QBrush, QStandardItem, QDialogButtonBox, QAction
 from PyQt4 import uic

 from E5Gui.E5Application import e5App
--- a/Project/DebuggerPropertiesDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/DebuggerPropertiesDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,8 @@
 import os
 import sys

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Project/FiletypeAssociationDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/FiletypeAssociationDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter filetype associations for the project.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt, pyqtSlot
+from PyQt4.QtGui import QHeaderView, QDialog, QTreeWidgetItem

 from .Ui_FiletypeAssociationDialog import Ui_FiletypeAssociationDialog
--- a/Project/NewDialogClassDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/NewDialogClassDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtGui import QDialog, QDialogButtonBox

 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Project/Project.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/Project.py	Sun Jun 05 18:25:36 2011 +0200
@@ -16,8 +16,10 @@
 import zipfile
 import re

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QFile, QFileInfo, pyqtSignal, QCryptographicHash, QIODevice, \
+    QByteArray, QObject, Qt
+from PyQt4.QtGui import QCursor, QLineEdit, QToolBar, QDialog, QInputDialog, \
+    QApplication, QMenu

 from E5Gui.E5Application import e5App
 from E5Gui import E5FileDialog, E5MessageBox
@@ -813,10 +815,9 @@
         Private method to delete the session file.
         """
         if self.pfile is None:
-            if not quiet:
-                E5MessageBox.critical(self.ui,
-                    self.trUtf8("Delete project session"),
-                    self.trUtf8("Please save the project first."))
+            E5MessageBox.critical(self.ui,
+                self.trUtf8("Delete project session"),
+                self.trUtf8("Please save the project first."))
             return

         fname, ext = os.path.splitext(os.path.basename(self.pfile))
@@ -942,10 +943,9 @@
         Private method to delete the project debugger properties file (.e4d)
         """
         if self.pfile is None:
-            if not quiet:
-                E5MessageBox.critical(self.ui,
-                    self.trUtf8("Delete debugger properties"),
-                    self.trUtf8("Please save the project first."))
+            E5MessageBox.critical(self.ui,
+                self.trUtf8("Delete debugger properties"),
+                self.trUtf8("Please save the project first."))
             return

         fname, ext = os.path.splitext(os.path.basename(self.pfile))
@@ -1755,7 +1755,7 @@
             E5MessageBox.critical(self.ui,
                 self.trUtf8("Delete directory"),
                 self.trUtf8("<p>The selected directory <b>{0}</b> could not be"
-                    " deleted.</p>").format(fn))
+                    " deleted.</p>").format(dn))
             return False

         self.removeDirectory(dn)
@@ -4143,7 +4143,7 @@
                 self.trUtf8("Create Plugin Archive"),
                 self.trUtf8("""<p>The plugin file <b>{0}</b> could """
                             """not be read.</p>"""
-                            """<p>Reason: {1}</p>""").format(archive, str(why)))
+                            """<p>Reason: {1}</p>""").format(filename, str(why)))
             return b"", ""

         lineno = 0
@@ -4180,7 +4180,7 @@
                 self.trUtf8("Create Plugin Archive"),
                 self.trUtf8("""<p>The plugin file <b>{0}</b> could """
                             """not be read.</p>"""
-                            """<p>Reason: {1}</p>""").format(archive, str(why)))
+                            """<p>Reason: {1}</p>""").format(filename, str(why)))
             return ""

         for sourceline in sourcelines:
--- a/Project/ProjectBaseBrowser.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/ProjectBaseBrowser.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,15 +9,17 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QModelIndex, pyqtSignal, Qt
+from PyQt4.QtGui import QTreeView, QCursor, QItemSelection, QItemSelectionModel, \
+    QApplication, QMenu, QAbstractItemView

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox

-from UI.Browser import *
+from UI.Browser import Browser

-from .ProjectBrowserModel import *
+from .ProjectBrowserModel import ProjectBrowserSimpleDirectoryItem, \
+    ProjectBrowserDirectoryItem, ProjectBrowserFileItem
 from .ProjectBrowserSortFilterProxyModel import ProjectBrowserSortFilterProxyModel
--- a/Project/ProjectBrowser.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/ProjectBrowser.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the project browser part of the eric5 UI.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt
+from PyQt4.QtGui import QColor, QApplication

 from UI.Browser import Browser
--- a/Project/ProjectBrowserModel.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/ProjectBrowserModel.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,10 +10,12 @@
 import os
 import re

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QDir, QModelIndex, pyqtSignal, QAbstractItemModel, \
+    QFileSystemWatcher, Qt
+from PyQt4.QtGui import QColor

-from UI.BrowserModel import *
+from UI.BrowserModel import BrowserModel, BrowserItem, BrowserDirectoryItem, \
+    BrowserFileItem

 import UI.PixmapCache
 import Preferences
--- a/Project/ProjectBrowserSortFilterProxyModel.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/ProjectBrowserSortFilterProxyModel.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,9 +7,6 @@
 Module implementing the browser sort filter proxy model.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
-
 from UI.BrowserSortFilterProxyModel import BrowserSortFilterProxyModel
 from .ProjectBrowserModel import ProjectBrowserSourceType
--- a/Project/ProjectFormsBrowser.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/ProjectFormsBrowser.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,8 @@
 import sys
 import shutil

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QThread, QFileInfo, pyqtSignal, QProcess
+from PyQt4.QtGui import QDialog, QInputDialog, QApplication, QMenu, QProgressDialog

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
@@ -715,7 +715,7 @@
         fn = itm.fileName()

         if self.hooks["generateDialogCode"] is not None:
-            self.hooks["generateDialogCode"](filename)
+            self.hooks["generateDialogCode"](fn)
         else:
             from .CreateDialogCodeDialog import CreateDialogCodeDialog
--- a/Project/ProjectInterfacesBrowser.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/ProjectInterfacesBrowser.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,8 @@
 import os
 import glob

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QThread, pyqtSignal, QProcess
+from PyQt4.QtGui import QDialog, QApplication, QMenu, QProgressDialog

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/Project/ProjectOthersBrowser.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/ProjectOthersBrowser.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,8 @@

 import mimetypes

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QModelIndex, pyqtSignal, QUrl
+from PyQt4.QtGui import QDesktopServices, QDialog, QMenu

 from .ProjectBrowserModel import ProjectBrowserFileItem, \
     ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \
--- a/Project/ProjectResourcesBrowser.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/ProjectResourcesBrowser.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QThread, QFileInfo, pyqtSignal, PYQT_VERSION, QProcess
+from PyQt4.QtGui import QDialog, QApplication, QMenu, QProgressDialog

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
--- a/Project/ProjectSourcesBrowser.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/ProjectSourcesBrowser.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal
+from PyQt4.QtGui import QDialog, QInputDialog, QMenu

 from E5Gui import E5MessageBox
--- a/Project/ProjectTranslationsBrowser.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/ProjectTranslationsBrowser.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,8 @@
 import shutil
 import fnmatch

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, QProcess
+from PyQt4.QtGui import QDialog, QMenu

 from E5Gui import E5MessageBox
--- a/Project/PropertiesDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/PropertiesDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
--- a/Project/SpellingPropertiesDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/SpellingPropertiesDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Completers import E5FileCompleter
 from E5Gui import E5FileDialog
--- a/Project/TranslationPropertiesDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/TranslationPropertiesDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QListWidgetItem, QDialog, QDialogButtonBox

 from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
 from E5Gui import E5FileDialog
--- a/Project/UserPropertiesDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/UserPropertiesDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing the user specific project properties dialog.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Application import e5App
--- a/PyUnit/UnittestDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/PyUnit/UnittestDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -14,8 +14,9 @@
 import re
 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, QEvent, Qt, pyqtSlot
+from PyQt4.QtGui import QWidget, QColor, QDialog, QApplication, QDialogButtonBox, \
+    QMainWindow

 from E5Gui.E5Application import e5App
 from E5Gui.E5Completers import E5FileCompleter
--- a/QScintilla/APIsManager.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/QScintilla/APIsManager.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt4.QtCore import *
+from PyQt4.QtCore import QDir, QFileInfo, pyqtSignal, QObject
 from PyQt4.Qsci import QsciAPIs

 from . import Lexers
--- a/QScintilla/Editor.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/QScintilla/Editor.py	Sun Jun 05 18:25:36 2011 +0200
@@ -6,18 +6,15 @@
 """
 Module implementing the editor component of the eric5 IDE.
 """
-
 import os
 import re
 import difflib

-from PyQt4.Qsci import QsciScintilla, QsciMacro
-try:
-    from PyQt4.Qsci import QsciStyledText
-except ImportError:
-    QsciStyledText = None   # __IGNORE_WARNING__
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QDir, QTimer, QModelIndex, QFileInfo, pyqtSignal, \
+    QCryptographicHash, QEvent, QDateTime, QRegExp, Qt
+from PyQt4.QtGui import QCursor, QPrinter, QPrintDialog, QLineEdit, QActionGroup, \
+    QDialog, QAbstractPrintDialog, QInputDialog, QApplication, QMenu, QPalette, QFont
+from PyQt4.Qsci import QsciScintilla, QsciMacro, QsciStyledText

 from E5Gui.E5Application import e5App
 from E5Gui import E5FileDialog, E5MessageBox
--- a/QScintilla/Exporters/ExporterBase.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/QScintilla/Exporters/ExporterBase.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the exporter base class.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QFileInfo, QObject
+from PyQt4.QtGui import QApplication

 from E5Gui import E5MessageBox, E5FileDialog
--- a/QScintilla/Exporters/ExporterHTML.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/QScintilla/Exporters/ExporterHTML.py	Sun Jun 05 18:25:36 2011 +0200
@@ -12,8 +12,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt
+from PyQt4.QtGui import QCursor, QFontInfo, QApplication
 from PyQt4.Qsci import QsciScintilla

 from E5Gui import E5MessageBox
@@ -245,7 +245,7 @@
                     html += '''&nbsp;''' * ts
                     column += ts
                 else:
-                    if tabs:
+                    if useTabs:
                         html += '\t'
                         column += 1
                     else:
--- a/QScintilla/Exporters/ExporterPDF.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/QScintilla/Exporters/ExporterPDF.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,9 +10,8 @@
 # This code is a port of the C++ code found in SciTE 1.74
 # Original code: Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>

-
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt
+from PyQt4.QtGui import QCursor, QFontInfo, QApplication
 from PyQt4.Qsci import QsciScintilla

 from E5Gui import E5MessageBox
--- a/QScintilla/Exporters/ExporterRTF.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/QScintilla/Exporters/ExporterRTF.py	Sun Jun 05 18:25:36 2011 +0200
@@ -12,8 +12,8 @@

 import time

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt
+from PyQt4.QtGui import QCursor, QFontInfo, QApplication
 from PyQt4.Qsci import QsciScintilla

 from E5Gui import E5MessageBox
--- a/QScintilla/Exporters/ExporterTEX.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/QScintilla/Exporters/ExporterTEX.py	Sun Jun 05 18:25:36 2011 +0200
@@ -12,8 +12,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt
+from PyQt4.QtGui import QCursor, QApplication
 from PyQt4.Qsci import QsciScintilla

 from E5Gui import E5MessageBox
--- a/QScintilla/MiniEditor.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/QScintilla/MiniEditor.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,11 @@
 import os
 import re

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QSignalMapper, QPoint, QTimer, QFileInfo, pyqtSignal, QSize, \
+    QRegExp, Qt
+from PyQt4.QtGui import QWidget, QCursor, QPrinter, QKeySequence, QPrintDialog, \
+    QWhatsThis, QActionGroup, QDialog, QAbstractPrintDialog, QInputDialog, \
+    QApplication, QMenu, QPalette, QMainWindow, QFont, QVBoxLayout, QLabel
 from PyQt4.Qsci import QsciScintilla

 from E5Gui.E5Action import E5Action, createActionGroup
--- a/QScintilla/Printer.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/QScintilla/Printer.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the printer functionality.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QTime, QDate, Qt
+from PyQt4.QtGui import QColor, QPrinter, QApplication
 from PyQt4.Qsci import QsciPrinter

 import Preferences
--- a/QScintilla/SearchReplaceWidget.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/QScintilla/SearchReplaceWidget.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the search and replace widget.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, pyqtSlot
+from PyQt4.QtGui import QWidget

 from .Ui_SearchWidget import Ui_SearchWidget
 from .Ui_ReplaceWidget import Ui_ReplaceWidget
--- a/QScintilla/Shell.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/QScintilla/Shell.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,9 @@
 import sys
 import re

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QFileInfo, Qt
+from PyQt4.QtGui import QDialog, QInputDialog, QApplication, QClipboard, QMenu, \
+    QPalette, QFont
 from PyQt4.Qsci import QsciScintilla

 from E5Gui.E5Application import e5App
--- a/QScintilla/ShellHistoryDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/QScintilla/ShellHistoryDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QListWidgetItem, QItemSelectionModel, QDialog

 from .Ui_ShellHistoryDialog import Ui_ShellHistoryDialog
--- a/QScintilla/SpellChecker.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/QScintilla/SpellChecker.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,18 +9,18 @@
 The spell checker is based on pyenchant.
 """

+import os
+
+from PyQt4.QtCore import QTimer, QObject
+
+import Preferences
+import Utilities
+
 try:
     import enchant
 except (ImportError, AttributeError, OSError):
     pass

-import os
-
-from PyQt4.QtCore import *
-
-import Preferences
-import Utilities
-

 class SpellChecker(QObject):
     """
--- a/QScintilla/SpellCheckingDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/QScintilla/SpellCheckingDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the spell checking dialog.
 """

+from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
-from PyQt4.QtCore import *

 from .Ui_SpellCheckingDialog import Ui_SpellCheckingDialog
--- a/QScintilla/Terminal.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/QScintilla/Terminal.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,8 @@
 import os
 import re

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QSignalMapper, QTimer, QByteArray, QProcess
+from PyQt4.QtGui import QDialog, QInputDialog, QApplication, QMenu, QPalette, QFont
 from PyQt4.Qsci import QsciScintilla

 from E5Gui.E5Application import e5App
--- a/SqlBrowser/SqlBrowser.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/SqlBrowser/SqlBrowser.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the SQL Browser main window.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QTimer, QUrl
+from PyQt4.QtGui import QKeySequence, qApp, QMainWindow
 from PyQt4.QtSql import QSqlError, QSqlDatabase

 from E5Gui.E5Action import E5Action
--- a/SqlBrowser/SqlBrowserWidget.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/SqlBrowser/SqlBrowserWidget.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the SQL Browser widget.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, QVariant, Qt, pyqtSlot
+from PyQt4.QtGui import QWidget, QStandardItemModel, QDialog, QAbstractItemView
 from PyQt4.QtSql import QSqlDatabase, QSqlError, QSqlTableModel, QSqlQueryModel, QSqlQuery

 from E5Gui import E5MessageBox
--- a/SqlBrowser/SqlConnectionDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/SqlBrowser/SqlConnectionDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the connection parameters.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtGui import QDialog, QDialogButtonBox
 from PyQt4.QtSql import QSqlDatabase

 from E5Gui.E5Completers import E5FileCompleter
--- a/SqlBrowser/SqlConnectionWidget.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/SqlBrowser/SqlConnectionWidget.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,9 @@
 Module implementing a widget showing the SQL connections.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt
+from PyQt4.QtGui import QWidget, QHeaderView, QTreeWidget, QVBoxLayout, \
+    QTreeWidgetItem, QAction
 from PyQt4.QtSql import QSqlDatabase
--- a/Tasks/TaskFilterConfigDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Tasks/TaskFilterConfigDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing the task filter configuration dialog.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog

 from .Ui_TaskFilterConfigDialog import Ui_TaskFilterConfigDialog
--- a/Tasks/TaskPropertiesDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Tasks/TaskPropertiesDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,7 @@

 import time

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog

 from E5Gui.E5Completers import E5FileCompleter
--- a/Tasks/TaskViewer.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Tasks/TaskViewer.py	Sun Jun 05 18:25:36 2011 +0200
@@ -15,8 +15,9 @@
 import time
 import fnmatch

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, QRegExp, Qt
+from PyQt4.QtGui import QHeaderView, QLineEdit, QTreeWidget, QDialog, QInputDialog, \
+    QApplication, QMenu, QAbstractItemView, QProgressDialog, QTreeWidgetItem

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/Templates/TemplateMultipleVariablesDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Templates/TemplateMultipleVariablesDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,9 @@
 Module implementing a dialog for entering multiple template variables.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QSize, Qt
+from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QLineEdit, \
+    QPushButton, QTextEdit, QDialog, QScrollArea, QFrame, QGridLayout, QVBoxLayout, QLabel


 class TemplateMultipleVariablesDialog(QDialog):
--- a/Templates/TemplatePropertiesDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Templates/TemplatePropertiesDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the templates properties dialog.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QRegExp, Qt, pyqtSlot
+from PyQt4.QtGui import QDialog, QRegExpValidator

 import QScintilla.Lexers
--- a/Templates/TemplateViewer.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Templates/TemplateViewer.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,8 @@
 import os
 import re

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QFile, QFileInfo, QIODevice, Qt
+from PyQt4.QtGui import QTreeWidget, QDialog, QApplication, QMenu, QTreeWidgetItem

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
--- a/ThirdParty/Pygments/pygments/lexers/asm.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/ThirdParty/Pygments/pygments/lexers/asm.py	Sun Jun 05 18:25:36 2011 +0200
@@ -8,12 +8,12 @@
     :copyright: Copyright 2006-2010 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-
 import re

 from pygments.lexer import RegexLexer, include, bygroups, using, DelegatingLexer
 from pygments.lexers.compiled import DLexer, CppLexer, CLexer
-from pygments.token import *
+from pygments.token import Keyword, Punctuation, Other, Name, Comment, String, Text, \
+    Number, Operator

 __all__ = ['GasLexer', 'ObjdumpLexer','DObjdumpLexer', 'CppObjdumpLexer',
            'CObjdumpLexer', 'LlvmLexer', 'NasmLexer']
--- a/Tools/TRPreviewer.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Tools/TRPreviewer.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,11 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QDir, QTimer, QFileInfo, pyqtSignal, QEvent, QSize, \
+    QTranslator, QObject, Qt
+from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QKeySequence, \
+    QWhatsThis, QMdiArea, qApp, QApplication, QMainWindow, QComboBox, QVBoxLayout, \
+    QAction, QLabel
 from PyQt4 import uic

 from E5Gui import E5MessageBox, E5FileDialog
@@ -759,13 +762,13 @@
                 del wview
                 return

-            self.rebuildWidgets.connect(wview.buildWidget)
-            wview.installEventFilter(self)
+            self.rebuildWidgets.connect(wview.buildWidget)  # __IGNORE_WARNING__
+            wview.installEventFilter(self)  # __IGNORE_WARNING__

-            win = self.addSubWindow(wview)
+            win = self.addSubWindow(wview)  # __IGNORE_WARNING__
             self.widgets.append(win)

-        wview.showNormal()
+        wview.showNormal()  # __IGNORE_WARNING__

     def eventFilter(self, obj, ev):
         """
--- a/Tools/UIPreviewer.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Tools/UIPreviewer.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,11 @@
 Module implementing the UI Previewer main window.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QDir, QFileInfo, QEvent, QSize, Qt
+from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QCursor, \
+    QPrinter, QKeySequence, QPrintDialog, QWhatsThis, QPixmap, QImageWriter, QPainter, \
+    QDialog, QScrollArea, qApp, QApplication, QStyleFactory, QFrame, QMainWindow, \
+    QComboBox, QVBoxLayout, QAction, QLabel
 from PyQt4 import uic

 from E5Gui import E5MessageBox, E5FileDialog
--- a/UI/Browser.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/UI/Browser.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,9 @@
 import os
 import mimetypes

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QModelIndex, pyqtSignal, QUrl, Qt
+from PyQt4.QtGui import QTreeView, QDesktopServices, QItemSelectionModel, QApplication, \
+    QMenu, QAbstractItemView

 from E5Gui.E5Application import e5App
 from E5Gui import E5FileDialog
--- a/UI/BrowserModel.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/UI/BrowserModel.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,8 @@
 import os
 import fnmatch

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QDir, QModelIndex, QAbstractItemModel, QFileSystemWatcher, Qt
+from PyQt4.QtGui import QImageReader, QApplication, QFont

 import Utilities.ClassBrowsers
 import Utilities.ClassBrowsers.ClbrBaseClasses
--- a/UI/BrowserSortFilterProxyModel.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/UI/BrowserSortFilterProxyModel.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the browser sort filter proxy model.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QModelIndex
+from PyQt4.QtGui import QSortFilterProxyModel

 import Preferences
--- a/UI/CompareDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/UI/CompareDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,9 @@
 import re
 from difflib import _mdiff, IS_CHARACTER_JUNK

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QTimer, QEvent, pyqtSlot
+from PyQt4.QtGui import QWidget, QColor, QFontMetrics, QBrush, QApplication, \
+    QTextCursor, QDialogButtonBox, QMainWindow

 from E5Gui.E5Completers import E5FileCompleter
 from E5Gui import E5MessageBox, E5FileDialog
--- a/UI/DiffDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/UI/DiffDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,9 @@
 import os
 import time

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QFileInfo, QEvent, pyqtSlot
+from PyQt4.QtGui import QWidget, QColor, QBrush, QApplication, QTextCursor, \
+    QDialogButtonBox, QMainWindow

 from E5Gui.E5Completers import E5FileCompleter
 from E5Gui import E5MessageBox, E5FileDialog
--- a/UI/EmailDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/UI/EmailDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -12,8 +12,9 @@
 import smtplib
 import socket

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt, pyqtSlot
+from PyQt4.QtGui import QCursor, QHeaderView, QLineEdit, QDialog, QInputDialog, \
+    QApplication, QDialogButtonBox, QTreeWidgetItem

 from E5Gui import E5MessageBox, E5FileDialog

@@ -22,12 +23,21 @@
 from .Info import BugAddress, FeatureAddress
 import Preferences
 import Utilities
+from base64 import b64encode as _bencode
+
+from email import encoders
+from email.mime.text import MIMEText
+from email.mime.image import MIMEImage
+from email.mime.audio import MIMEAudio
+from email.mime.application import MIMEApplication
+from email.mime.multipart import MIMEMultipart
+from email.header import Header
+

 ############################################################
 ## This code is to work around a bug in the Python email  ##
 ## package for Image and Audio mime messages.             ##
 ############################################################
-from base64 import b64encode as _bencode


 def _encode_base64(msg):
@@ -43,14 +53,7 @@
     msg.set_payload(encdata)
     msg['Content-Transfer-Encoding'] = 'base64'

-from email import encoders
 encoders.encode_base64 = _encode_base64     # WORK AROUND: implement our corrected encoder
-from email.mime.text import MIMEText
-from email.mime.image import MIMEImage
-from email.mime.audio import MIMEAudio
-from email.mime.application import MIMEApplication
-from email.mime.multipart import MIMEMultipart
-from email.header import Header


 class EmailDialog(QDialog, Ui_EmailDialog):
--- a/UI/FindFileDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/UI/FindFileDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,9 @@
 import os
 import re

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, Qt, pyqtSlot
+from PyQt4.QtGui import QCursor, QDialog, QApplication, QMenu, QDialogButtonBox, \
+    QTreeWidgetItem

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
@@ -590,7 +591,7 @@
                     text, encoding, hash = \
                         Utilities.readEncodedFileWithHash(fn)
                     lines = text.splitlines(True)
-                except (UnicodeError, IOError):
+                except (UnicodeError, IOError) as err:
                     E5MessageBox.critical(self,
                         self.trUtf8("Replace in Files"),
                         self.trUtf8(
--- a/UI/FindFileNameDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/UI/FindFileNameDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -10,8 +10,9 @@
 import os
 import sys

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import pyqtSignal, pyqtSlot
+from PyQt4.QtGui import QWidget, QHeaderView, QApplication, QDialogButtonBox, \
+    QTreeWidgetItem

 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
--- a/UI/LogView.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/UI/LogView.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing the log viewer widget and the log widget.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt
+from PyQt4.QtGui import QTextEdit, QBrush, QApplication, QMenu, QTextCursor

 from E5Gui.E5Application import e5App
--- a/UI/UserInterface.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/UI/UserInterface.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,11 @@
 import sys
 import logging

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QTimer, QFile, QFileInfo, pyqtSignal, PYQT_VERSION_STR, QDate, \
+    QIODevice, QByteArray, qVersion, QProcess, QSize, QUrl, QObject, Qt
+from PyQt4.QtGui import QSizePolicy, QWidget, QKeySequence, QDesktopServices, \
+    QWhatsThis, QToolBar, QDialog, QSplitter, QApplication, QMenu, QStyleFactory, \
+    QMainWindow, QProgressDialog, QVBoxLayout, QDockWidget, QAction, QLabel
 from PyQt4.Qsci import QSCINTILLA_VERSION_STR
 from PyQt4.QtNetwork import QNetworkProxyFactory, QNetworkAccessManager, \
     QNetworkRequest, QNetworkReply
@@ -63,7 +66,7 @@
 from Cooperation.ChatWidget import ChatWidget

 from .Browser import Browser
-from .Info import *
+from .Info import Version, BugAddress, Program, FeatureAddress
 from . import Config
 from .EmailDialog import EmailDialog
 from .DiffDialog import DiffDialog
@@ -5624,7 +5627,7 @@
         @param errors list of SSL errors (list of QSslError)
         """
         errorStrings = []
-        for err in sslErrors:
+        for err in errors:
             errorStrings.append(err.errorString())
         errorString = '.<br />'.join(errorStrings)
         ret = E5MessageBox.yesNo(self,
--- a/Utilities/__init__.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Utilities/__init__.py	Sun Jun 05 18:25:36 2011 +0200
@@ -333,6 +333,7 @@
     buf = buf.replace(b"\x00", b"")
     return decodeBytes(buf)

+
 def decodeBytes(buffer):
     """
     Function to decode some byte text into a string.
--- a/VCS/CommandOptionsDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/VCS/CommandOptionsDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,7 @@
 Module implementing the VCS command options dialog.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui import QDialog

 from .Ui_CommandOptionsDialog import Ui_vcsCommandOptionsDialog
--- a/VCS/ProjectHelper.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/VCS/ProjectHelper.py	Sun Jun 05 18:25:36 2011 +0200
@@ -11,8 +11,8 @@
 import shutil
 import copy

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QDir, QFileInfo, QObject
+from PyQt4.QtGui import QDialog, QInputDialog

 from .CommandOptionsDialog import vcsCommandOptionsDialog
 from .RepositoryInfoDialog import VcsRepositoryInfoDialog
--- a/VCS/StatusMonitorLed.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/VCS/StatusMonitorLed.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a LED to indicate the status of the VCS status monitor thread.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import Qt
+from PyQt4.QtGui import QColor, QInputDialog, QMenu

 from E5Gui.E5Led import E5Led, E5LedRectangular
--- a/ViewManager/BookmarkedFilesDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/ViewManager/BookmarkedFilesDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a configuration dialog for the bookmarked files menu.
 """

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QFileInfo, Qt, pyqtSlot
+from PyQt4.QtGui import QListWidgetItem, QColor, QDialog

 from E5Gui.E5Completers import E5FileCompleter
 from E5Gui import E5FileDialog
--- a/ViewManager/ViewManager.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/ViewManager/ViewManager.py	Sun Jun 05 18:25:36 2011 +0200
@@ -9,8 +9,10 @@

 import os

-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QSignalMapper, QTimer, QFileInfo, pyqtSignal, QRegExp, \
+    QObject, Qt
+from PyQt4.QtGui import QColor, QKeySequence, QLineEdit, QToolBar, QWidgetAction, \
+    QDialog, QApplication, QMenu, QPalette, QComboBox
 from PyQt4.Qsci import QsciScintilla

 from E5Gui.E5Application import e5App