Started to clean up the code supported by py3flakes.

Sun, 31 Jan 2010 17:11:22 +0000

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 31 Jan 2010 17:11:22 +0000
changeset 96
9624a110667d
parent 95
261bc03812fd
child 97
c4086afea02b

Started to clean up the code supported by py3flakes.

DataViews/CodeMetrics.py file | annotate | diff | comparison | revisions
DataViews/CodeMetricsDialog.py file | annotate | diff | comparison | revisions
DataViews/PyCoverageDialog.py file | annotate | diff | comparison | revisions
DataViews/PyProfileDialog.py file | annotate | diff | comparison | revisions
DebugClients/Python/DebugThread.py file | annotate | diff | comparison | revisions
DebugClients/Python/PyProfile.py file | annotate | diff | comparison | revisions
DebugClients/Python/getpass.py file | annotate | diff | comparison | revisions
DebugClients/Python3/AsyncFile.py file | annotate | diff | comparison | revisions
DebugClients/Python3/AsyncIO.py file | annotate | diff | comparison | revisions
DebugClients/Python3/DebugBase.py file | annotate | diff | comparison | revisions
DebugClients/Python3/DebugClientBase.py file | annotate | diff | comparison | revisions
DebugClients/Python3/DebugThread.py file | annotate | diff | comparison | revisions
DebugClients/Python3/getpass.py file | annotate | diff | comparison | revisions
Debugger/Config.py file | annotate | diff | comparison | revisions
Debugger/DebugServer.py file | annotate | diff | comparison | revisions
Debugger/DebugViewer.py file | annotate | diff | comparison | revisions
Debugger/DebuggerInterfacePython.py file | annotate | diff | comparison | revisions
Debugger/DebuggerInterfacePython3.py file | annotate | diff | comparison | revisions
Debugger/DebuggerInterfaceRuby.py file | annotate | diff | comparison | revisions
Debugger/StartDialog.py file | annotate | diff | comparison | revisions
Debugger/VariablesViewer.py file | annotate | diff | comparison | revisions
Debugger/WatchPointViewer.py file | annotate | diff | comparison | revisions
DocumentationTools/APIGenerator.py file | annotate | diff | comparison | revisions
DocumentationTools/IndexGenerator.py file | annotate | diff | comparison | revisions
DocumentationTools/ModuleDocumentor.py file | annotate | diff | comparison | revisions
DocumentationTools/QtHelpGenerator.py file | annotate | diff | comparison | revisions
E5Graphics/E5GraphicsView.py file | annotate | diff | comparison | revisions
E5Gui/E5Action.py file | annotate | diff | comparison | revisions
E5Gui/E5SideBar.py file | annotate | diff | comparison | revisions
E5Gui/E5SingleApplication.py file | annotate | diff | comparison | revisions
E5Gui/E5TreeView.py file | annotate | diff | comparison | revisions
E5Network/E5NetworkHeaderDetailsDialog.py file | annotate | diff | comparison | revisions
E5XML/DebuggerPropertiesWriter.py file | annotate | diff | comparison | revisions
E5XML/HighlightingStylesWriter.py file | annotate | diff | comparison | revisions
E5XML/MultiProjectWriter.py file | annotate | diff | comparison | revisions
E5XML/ProjectWriter.py file | annotate | diff | comparison | revisions
E5XML/SessionWriter.py file | annotate | diff | comparison | revisions
E5XML/TasksWriter.py file | annotate | diff | comparison | revisions
E5XML/TemplatesHandler.py file | annotate | diff | comparison | revisions
E5XML/TemplatesWriter.py file | annotate | diff | comparison | revisions
E5XML/UserProjectHandler.py file | annotate | diff | comparison | revisions
E5XML/XMLEntityResolver.py file | annotate | diff | comparison | revisions
E5XML/XMLErrorHandler.py file | annotate | diff | comparison | revisions
E5XML/XMLHandlerBase.py file | annotate | diff | comparison | revisions
Graphics/ApplicationDiagram.py file | annotate | diff | comparison | revisions
Graphics/AssociationItem.py file | annotate | diff | comparison | revisions
Graphics/GraphicsUtilities.py file | annotate | diff | comparison | revisions
Graphics/ImportsDiagram.py file | annotate | diff | comparison | revisions
Graphics/UMLGraphicsView.py file | annotate | diff | comparison | revisions
Helpviewer/AdBlock/AdBlockManager.py file | annotate | diff | comparison | revisions
Helpviewer/AdBlock/AdBlockNetwork.py file | annotate | diff | comparison | revisions
Helpviewer/AdBlock/AdBlockPage.py file | annotate | diff | comparison | revisions
Helpviewer/Bookmarks/BookmarksToolBar.py file | annotate | diff | comparison | revisions
Helpviewer/CookieJar/CookieDetailsDialog.py file | annotate | diff | comparison | revisions
Helpviewer/CookieJar/CookieJar.py file | annotate | diff | comparison | revisions
Helpviewer/CookieJar/CookiesConfigurationDialog.py file | annotate | diff | comparison | revisions
Helpviewer/DownloadDialog.py file | annotate | diff | comparison | revisions
Helpviewer/HelpBrowserWV.py file | annotate | diff | comparison | revisions
Helpviewer/HelpClearPrivateDataDialog.py file | annotate | diff | comparison | revisions
Helpviewer/HelpTopicDialog.py file | annotate | diff | comparison | revisions
Helpviewer/HelpWebSearchWidget.py file | annotate | diff | comparison | revisions
Helpviewer/HelpWindow.py file | annotate | diff | comparison | revisions
Helpviewer/Network/NetworkAccessManager.py file | annotate | diff | comparison | revisions
Helpviewer/Network/NetworkProtocolUnknownErrorReply.py file | annotate | diff | comparison | revisions
Helpviewer/OpenSearch/OpenSearchDialog.py file | annotate | diff | comparison | revisions
Helpviewer/Passwords/PasswordManager.py file | annotate | diff | comparison | revisions
IconEditor/IconEditorWindow.py file | annotate | diff | comparison | revisions
IconEditor/IconSizeDialog.py file | annotate | diff | comparison | revisions
MultiProject/MultiProject.py file | annotate | diff | comparison | revisions
PluginManager/PluginInstallDialog.py file | annotate | diff | comparison | revisions
Plugins/AboutPlugin/AboutDialog.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/Tabnanny/Tabnanny.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py file | annotate | diff | comparison | revisions
Plugins/PluginEricapi.py file | annotate | diff | comparison | revisions
Plugins/PluginEricdoc.py file | annotate | diff | comparison | revisions
Plugins/PluginVcsPySvn.py file | annotate | diff | comparison | revisions
Plugins/PluginVcsSubversion.py file | annotate | diff | comparison | revisions
Plugins/PluginVmMdiArea.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/subversion.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnUtilities.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/subversion.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py file | annotate | diff | comparison | revisions
--- a/DataViews/CodeMetrics.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DataViews/CodeMetrics.py	Sun Jan 31 17:11:22 2010 +0000
@@ -221,8 +221,6 @@
 
     stats = SourceStat()
     stats.inc('lines', parser.lines)
-    comments = 0
-    empty = 0
     for idx in range(len(parser.tokenlist)):
         tok = parser.tokenlist[idx]
         
--- a/DataViews/CodeMetricsDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DataViews/CodeMetricsDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,9 +7,7 @@
 Module implementing a code metrics dialog.
 """
 
-import sys
 import os
-import types
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
--- a/DataViews/PyCoverageDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DataViews/PyCoverageDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,9 +7,7 @@
 Module implementing a Python code coverage dialog.
 """
 
-import sys
 import os
-import types
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
--- a/DataViews/PyProfileDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DataViews/PyProfileDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing a dialog to display profile data.
 """
 
-import sys
 import os
 import pickle
 
@@ -313,4 +312,4 @@
             self.exclude = True
             self.filterItm.setText(self.trUtf8('Exclude Python Library'))
             self.__populateLists(False)
-        self.__finish()
\ No newline at end of file
+        self.__finish()
--- a/DebugClients/Python/DebugThread.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DebugClients/Python/DebugThread.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 import bdb
-import os
 import sys
 
 from DebugBase import *
--- a/DebugClients/Python/PyProfile.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DebugClients/Python/PyProfile.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,6 @@
 
 import os
 import marshal
-import types
 import profile
 import atexit
 import pickle
--- a/DebugClients/Python/getpass.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DebugClients/Python/getpass.py	Sun Jan 31 17:11:22 2010 +0000
@@ -13,8 +13,6 @@
 is to provide a debugger compatible variant of the a.m. functions.
 """
 
-import sys
-
 __all__ = ["getpass","getuser"]
 
 def getuser():
--- a/DebugClients/Python3/AsyncFile.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DebugClients/Python3/AsyncFile.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,9 +8,8 @@
 """
 
 import socket
-import sys
 
-from DebugProtocol import EOT, RequestOK
+from DebugProtocol import EOT
 
 
 def AsyncPendingWrite(file):
--- a/DebugClients/Python3/AsyncIO.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DebugClients/Python3/AsyncIO.py	Sun Jan 31 17:11:22 2010 +0000
@@ -48,7 +48,7 @@
         """
         try:
             got = self.readfd.readline_p()
-        except Exception as exc:
+        except Exception:
             return
 
         if len(got) == 0:
--- a/DebugClients/Python3/DebugBase.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DebugClients/Python3/DebugBase.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,10 +8,8 @@
 """
 
 import sys
-import traceback
 import bdb
 import os
-import types
 import atexit
 import inspect
 
@@ -735,4 +733,4 @@
         
         @return last debugger event (string)
         """
-        return self.__event
\ No newline at end of file
+        return self.__event
--- a/DebugClients/Python3/DebugClientBase.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DebugClients/Python3/DebugClientBase.py	Sun Jan 31 17:11:22 2010 +0000
@@ -16,8 +16,6 @@
 import time
 import imp
 import re
-import distutils.sysconfig
-import imp
 
 
 from DebugProtocol import *
@@ -32,7 +30,7 @@
 
 ################################################################################
 
-def DebugClientInput(prompt = ""):
+def DebugClientInput(prompt = "", echo = True):
     """
     Replacement for the standard input builtin.
     
@@ -43,7 +41,7 @@
     if DebugClientInstance is None or not DebugClientInstance.redirect:
         return DebugClientOrigInput(prompt)
 
-    return DebugClientInstance.input(prompt)
+    return DebugClientInstance.input(prompt, echo)
 
 # Use our own input().
 try:
@@ -285,14 +283,15 @@
         
         self.write("{0}{1!r}\n".format(ResponseThreadList, (currentId, threadList)))
     
-    def input(self, prompt):
+    def input(self, prompt, echo = True):
         """
         Public method to implement input() using the event loop.
         
         @param prompt the prompt to be shown (string)
+        @param echo Flag indicating echoing of the input (boolean)
         @return the entered string
         """
-        self.write("{0}{1!r}\n".format(ResponseRaw, (prompt, 1)))
+        self.write("{0}{1!r}\n".format(ResponseRaw, (prompt, echo)))
         self.inRawMode = True
         self.eventLoop(True)
         return self.rawLine
--- a/DebugClients/Python3/DebugThread.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DebugClients/Python3/DebugThread.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 import bdb
-import os
 import sys
 
 from DebugBase import *
--- a/DebugClients/Python3/getpass.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DebugClients/Python3/getpass.py	Sun Jan 31 17:11:22 2010 +0000
@@ -13,8 +13,6 @@
 is to provide a debugger compatible variant of the a.m. functions.
 """
 
-import sys
-
 __all__ = ["getpass", "getuser"]
 
 def getuser():
@@ -46,7 +44,7 @@
     @param prompt Prompt to be shown to the user (string)
     @return Password entered by the user (string)
     """
-    return raw_input(prompt, 0)
+    return input(prompt, False)
     
 unix_getpass = getpass
 win_getpass = getpass
--- a/Debugger/Config.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Debugger/Config.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,8 +7,6 @@
 Module defining the different Python types and their display strings.
 """
 
-from DebugClients.Python.DebugConfig import ConfigVarTypeStrings
-    
 try:
     from PyQt4.QtCore import QT_TRANSLATE_NOOP
     
--- a/Debugger/DebugServer.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Debugger/DebugServer.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,10 +7,7 @@
 Module implementing the debug server.
 """
 
-import sys
 import os
-import time
-import signal
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import QMessageBox
@@ -279,7 +276,7 @@
         """
         if clType is not None and clType in self.getSupportedLanguages():
             self.clientType = clType
-            ok = Preferences.Prefs.settings.setValue('DebugClient/Type', 
+            Preferences.Prefs.settings.setValue('DebugClient/Type', 
                 self.clientType)
         
     def startClient(self, unplanned = True, clType = None, forProject = False, 
@@ -460,7 +457,10 @@
             cond, special = cond.split()
             special = self.watchSpecialChanged
         else:
-            return cond, ""
+            cond = cond
+            special = ""
+        
+        return cond, special
         
     def __clientClearWatchPoint(self, condition):
         """
@@ -1256,4 +1256,4 @@
         
         @return flag indicating a connection (boolean)
         """
-        return self.debuggerInterface and self.debuggerInterface.isConnected()
\ No newline at end of file
+        return self.debuggerInterface and self.debuggerInterface.isConnected()
--- a/Debugger/DebugViewer.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Debugger/DebugViewer.py	Sun Jan 31 17:11:22 2010 +0000
@@ -30,7 +30,6 @@
 from .BreakPointViewer import BreakPointViewer
 from .WatchPointViewer import WatchPointViewer
 
-import Utilities
 import UI.PixmapCache
 
 from E5Gui.E5TabWidget import E5TabWidget
@@ -433,4 +432,4 @@
         """
         if current is not None and self.__doThreadListUpdate:
             tid = int(current.text(0))
-            self.debugServer.remoteSetThread(tid)
\ No newline at end of file
+            self.debugServer.remoteSetThread(tid)
--- a/Debugger/DebuggerInterfacePython.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Debugger/DebuggerInterfacePython.py	Sun Jan 31 17:11:22 2010 +0000
@@ -9,7 +9,6 @@
 
 import sys
 import os
-import socket
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import QInputDialog, QMessageBox
@@ -941,4 +940,4 @@
         if self.qsock is not None:
             self.qsock.write(cmd.encode('utf8'))
         else:
-            self.queue.append(cmd)
\ No newline at end of file
+            self.queue.append(cmd)
--- a/Debugger/DebuggerInterfacePython3.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Debugger/DebuggerInterfacePython3.py	Sun Jan 31 17:11:22 2010 +0000
@@ -9,7 +9,6 @@
 
 import sys
 import os
-import socket
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import QInputDialog, QMessageBox
@@ -940,4 +939,4 @@
         if self.qsock is not None:
             self.qsock.write(cmd.encode('utf8', 'backslashreplace'))
         else:
-            self.queue.append(cmd)
\ No newline at end of file
+            self.queue.append(cmd)
--- a/Debugger/DebuggerInterfaceRuby.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Debugger/DebuggerInterfaceRuby.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,9 +7,7 @@
 Module implementing the Ruby debugger interface for the debug server.
 """
 
-import sys
 import os
-import socket
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import QMessageBox
@@ -832,4 +830,4 @@
         if self.qsock is not None:
             self.qsock.write(cmd.encode('utf8'))
         else:
-            self.queue.append(cmd)
\ No newline at end of file
+            self.queue.append(cmd)
--- a/Debugger/StartDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Debugger/StartDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,8 +7,6 @@
 Module implementing the Start Program dialog.
 """
 
-import os
-
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
@@ -209,4 +207,4 @@
         @param button button that was clicked (QAbstractButton)
         """
         if button == self.clearButton:
-            self.__clearHistories()
\ No newline at end of file
+            self.__clearHistories()
--- a/Debugger/VariablesViewer.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Debugger/VariablesViewer.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,16 +7,14 @@
 Module implementing the variables viewer widget.
 """
 
-import types
-from math import log10
-import sys
-
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
 from E5Gui.E5Application import e5App
 
-from .Config import ConfigVarTypeDispStrings, ConfigVarTypeStrings
+from DebugClients.Python3.DebugConfig import ConfigVarTypeStrings
+    
+from .Config import ConfigVarTypeDispStrings
 from .VariableDetailDialog import VariableDetailDialog
 
 import Preferences
@@ -441,12 +439,10 @@
             if self.current:
                 self.curpathlist = self.__buildTreePath(self.current)
         
-        subelementsAdded = False
         if vlist:
             itm = self.__findItem(vlist[0], 0)
             for var, vtype, value in vlist[1:]:
                 self.__addItem(itm, vtype, var, value)
-            subelementsAdded = True
 
         # reexpand tree
         openItems = sorted(self.openItems[:])
@@ -711,4 +707,4 @@
         """
         Private method to open the configuration dialog.
         """
-        e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage")
\ No newline at end of file
+        e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage")
--- a/Debugger/WatchPointViewer.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Debugger/WatchPointViewer.py	Sun Jan 31 17:11:22 2010 +0000
@@ -205,7 +205,7 @@
         """
         for index in self.selectedIndexes():
             self.__setRowSelected(index, False)
-            
+    
     def __findDuplicates(self, cond, special, showMessage = False, index = QModelIndex()):
         """
         Private method to check, if an entry already exists.
@@ -234,13 +234,6 @@
         
         return duplicate
     
-    def __clearSelection(self):
-        """
-        Private slot to clear the selection.
-        """
-        for index in self.selectedIndexes():
-            self.__setRowSelected(index, False)
-            
     def __addWatchPoint(self):
         """
         Private slot to handle the add watch expression context menu entry.
@@ -388,7 +381,6 @@
         for index in self.selectedIndexes():
             sindex = self.__toSourceIndex(index)
             if sindex.isValid() and index.column() == 0:
-                lastrow = index.row()
                 idxList.append(sindex)
         self.__model.deleteWatchPoints(idxList)
 
@@ -419,4 +411,4 @@
         """
         Private method to open the configuration dialog.
         """
-        e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage")
\ No newline at end of file
+        e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage")
--- a/DocumentationTools/APIGenerator.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DocumentationTools/APIGenerator.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,8 +8,6 @@
 
 """
 
-import sys
-
 from QScintilla.Editor import Editor
 
 class APIGenerator(object):
--- a/DocumentationTools/IndexGenerator.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DocumentationTools/IndexGenerator.py	Sun Jan 31 17:11:22 2010 +0000
@@ -78,7 +78,6 @@
         if "__init__" in file:
             dir = os.path.dirname(file)
             udir = os.path.dirname(dir)
-            base = os.path.basename(dir)
             if udir:
                 upackage = udir.replace(os.sep, ".")
                 try:
@@ -98,9 +97,8 @@
             
             if moduleDocument.isEmpty():
                 return
-            
+        
         package = os.path.dirname(file).replace(os.sep, ".")
-        name = os.path.splitext(file)[0].replace(os.sep, ".")
         try:
             elt = self.packages[package]
         except KeyError:
--- a/DocumentationTools/ModuleDocumentor.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DocumentationTools/ModuleDocumentor.py	Sun Jan 31 17:11:22 2010 +0000
@@ -526,7 +526,6 @@
             else:
                 supers = 'None'
             
-            classname = "%s.%s" % (modName, className)
             methList, methBodies = self.__genMethodSection(_class, className)
             
             try:
@@ -741,8 +740,8 @@
             try:
                 reference, label = entry.split(None, 1)
             except ValueError:
-                reference = seeEntryString
-                label = seeEntryString
+                reference = entry
+                label = entry
             try:
                 path, anchor = reference.split('#', 1)
             except ValueError:
--- a/DocumentationTools/QtHelpGenerator.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/DocumentationTools/QtHelpGenerator.py	Sun Jan 31 17:11:22 2010 +0000
@@ -109,7 +109,6 @@
         if "__init__" in file:
             dir = os.path.dirname(file)
             udir = os.path.dirname(dir)
-            base = os.path.basename(dir)
             if udir:
                 upackage = udir.replace(os.sep, ".")
                 try:
@@ -174,15 +173,6 @@
         s += indent + '</section>\n'
         return s
     
-    def __generateKeywords(self):
-        """
-        Private method to generate the keywords section.
-        
-        @return keywords section (string)
-        """
-        indent = level * '  '
-        return "\n".join([])
-    
     def generateFiles(self, basename = ""):
         """
         Public method to generate all index files.
--- a/E5Graphics/E5GraphicsView.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5Graphics/E5GraphicsView.py	Sun Jan 31 17:11:22 2010 +0000
@@ -232,7 +232,7 @@
         """
         rect = self._getDiagramRect(self.border)
         if format == "SVG":
-            svg = self.__getDiagram(rect, format = format, filename = filename)
+            self.__getDiagram(rect, format = format, filename = filename)
             return True
         else:
             pixmap = self.__getDiagram(rect)
@@ -339,4 +339,4 @@
         @return list of interesting collision items (QGraphicsItem)
         """
         # just return the list unchanged
-        return items
\ No newline at end of file
+        return items
--- a/E5Gui/E5Action.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5Gui/E5Action.py	Sun Jan 31 17:11:22 2010 +0000
@@ -11,7 +11,6 @@
 """
 
 from PyQt4.QtGui import QAction, QActionGroup, QIcon, QKeySequence
-from PyQt4.QtCore import QObject
 
 class ArgumentsError(RuntimeError):
     """
@@ -157,4 +156,4 @@
     if name:
         actGrp.setObjectName(name)
     actGrp.setExclusive(exclusive)
-    return actGrp
\ No newline at end of file
+    return actGrp
--- a/E5Gui/E5SideBar.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5Gui/E5SideBar.py	Sun Jan 31 17:11:22 2010 +0000
@@ -154,10 +154,8 @@
         if obj == self.__tabBar:
             if evt.type() == QEvent.MouseButtonPress:
                 pos = evt.pos()
-                index = -1
                 for i in range(self.__tabBar.count()):
                     if self.__tabBar.tabRect(i).contains(pos):
-                        index = i
                         break
                 
                 if i == self.__tabBar.currentIndex():
@@ -480,7 +478,7 @@
         
         data = QByteArray(state)
         stream = QDataStream(data, QIODevice.ReadOnly)
-        version = stream.readUInt16()
+        stream.readUInt16() # version
         minimized = stream.readBool()
         
         if minimized:
@@ -547,4 +545,4 @@
         @param event reference to the event (QEvent)
         """
         if self.__autoHide and not self.__hasFocus and not self.isMinimized():
-            self.shrink()
\ No newline at end of file
+            self.shrink()
--- a/E5Gui/E5SingleApplication.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5Gui/E5SingleApplication.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing the single application server and client.
 """
 
-import sys
 import os
 
 from E5Gui.E5Application import e5App
@@ -161,4 +160,4 @@
         @param argsStr space delimited list of command args (string)
         """
         cmd = "%s%s\n" % (SAArguments, argsStr)
-        self.sendCommand(cmd)
\ No newline at end of file
+        self.sendCommand(cmd)
--- a/E5Gui/E5TreeView.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5Gui/E5TreeView.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,7 @@
 """
 
 from PyQt4.QtCore import Qt
-from PyQt4.QtGui import QTreeView, QItemSelectionModel
+from PyQt4.QtGui import QTreeView
 
 class E5TreeView(QTreeView):
     """
@@ -47,4 +47,4 @@
         """
         if self.model() is not None:
             self.model().removeRows(0, self.model().rowCount(self.rootIndex()), 
-                                    self.rootIndex())
\ No newline at end of file
+                                    self.rootIndex())
--- a/E5Network/E5NetworkHeaderDetailsDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5Network/E5NetworkHeaderDetailsDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 from PyQt4.QtGui import QDialog
-from PyQt4.QtCore import pyqtSlot
 
 from .Ui_E5NetworkHeaderDetailsDialog import Ui_E5NetworkHeaderDetailsDialog
 
@@ -33,4 +32,4 @@
         @param value value of the header (string)
         """
         self.nameEdit.setText(name)
-        self.valueEdit.setPlainText(value)
\ No newline at end of file
+        self.valueEdit.setPlainText(value)
--- a/E5XML/DebuggerPropertiesWriter.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5XML/DebuggerPropertiesWriter.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing the writer class for writing an XML project debugger properties file.
 """
 
-import os
 import time
 
 from E5Gui.E5Application import e5App
@@ -89,4 +88,4 @@
         self._write('  <Noencoding on="%d" />' % \
             self.project.debugProperties["NOENCODING"])
         
-        self._write("</DebuggerProperties>", newline = False)
\ No newline at end of file
+        self._write("</DebuggerProperties>", newline = False)
--- a/E5XML/HighlightingStylesWriter.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5XML/HighlightingStylesWriter.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,11 +7,8 @@
 Module implementing the writer class for writing a highlighting styles XML file.
 """
 
-import os
 import time
 
-from E5Gui.E5Application import e5App
-
 from .XMLWriterBase import XMLWriterBase
 from .Config import highlightingStylesFileFormatVersion
 
@@ -62,4 +59,4 @@
                 )
             self._write('  </Lexer>')
         
-        self._write("</HighlightingStyles>", newline = False)
\ No newline at end of file
+        self._write("</HighlightingStyles>", newline = False)
--- a/E5XML/MultiProjectWriter.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5XML/MultiProjectWriter.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,11 +7,8 @@
 Module implementing the writer class for writing an XML multi project file.
 """
 
-import os
 import time
 
-from E5Gui.E5Application import e5App
-
 from .XMLWriterBase import XMLWriterBase
 from .Config import multiProjectFileFormatVersion
 
@@ -70,4 +67,4 @@
             self._write("    </Project>")
         self._write("  </Projects>")
         
-        self._write("</MultiProject>", newline = False)
\ No newline at end of file
+        self._write("</MultiProject>", newline = False)
--- a/E5XML/ProjectWriter.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5XML/ProjectWriter.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing the writer class for writing an XML project file.
 """
 
-import os
 import time
 
 from E5Gui.E5Application import e5App
@@ -222,4 +221,4 @@
                 self._write("    </OtherToolsParams>")
             self._write("  </OtherTools>")
         
-        self._write("</Project>", newline = False)
\ No newline at end of file
+        self._write("</Project>", newline = False)
--- a/E5XML/SessionWriter.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5XML/SessionWriter.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing the writer class for writing an XML project session file.
 """
 
-import os
 import time
 
 from E5Gui.E5Application import e5App
@@ -198,4 +197,4 @@
                     self._write("    </Bookmark>")
         self._write("  </Bookmarks>")
         
-        self._write("</Session>", newline = False)
\ No newline at end of file
+        self._write("</Session>", newline = False)
--- a/E5XML/TasksWriter.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5XML/TasksWriter.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing the writer class for writing an XML tasks file.
 """
 
-import os
 import time
 
 from E5Gui.E5Application import e5App
@@ -77,4 +76,4 @@
                 self._write('    </Resource>')
             self._write('  </Task>')
         
-        self._write('</Tasks>', newline = False)
\ No newline at end of file
+        self._write('</Tasks>', newline = False)
--- a/E5XML/TemplatesHandler.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5XML/TemplatesHandler.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,9 +7,6 @@
 Module implementing the handler class for reading an XML templates file.
 """
 
-import os
-import time
-
 from E5Gui.E5Application import e5App
 
 from .Config import templatesFileFormatVersion
@@ -108,4 +105,4 @@
         
         @return String containing the version number.
         """
-        return self.version
\ No newline at end of file
+        return self.version
--- a/E5XML/TemplatesWriter.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5XML/TemplatesWriter.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing the writer class for writing an XML templates file.
 """
 
-import os
 import time
 
 from .XMLWriterBase import XMLWriterBase
@@ -60,4 +59,4 @@
                 self._write('    </Template>')
             self._write('  </TemplateGroup>')
         
-        self._write('</Templates>', newline = False)
\ No newline at end of file
+        self._write('</Templates>', newline = False)
--- a/E5XML/UserProjectHandler.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5XML/UserProjectHandler.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,8 +7,6 @@
 Module implementing the handler class for reading an XML user project properties file.
 """
 
-import os
-
 from .Config import userProjectFileFormatVersion
 from .XMLHandlerBase import XMLHandlerBase
 
--- a/E5XML/XMLEntityResolver.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5XML/XMLEntityResolver.py	Sun Jan 31 17:11:22 2010 +0000
@@ -10,8 +10,6 @@
 import os.path
 from xml.sax.handler import EntityResolver
 
-import Utilities
-
 from eric5config import getConfig
 
 class XMLEntityResolver(EntityResolver):
@@ -45,4 +43,4 @@
                 if not os.path.exists(sId):
                     sId = ""
         
-        return sId
\ No newline at end of file
+        return sId
--- a/E5XML/XMLErrorHandler.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5XML/XMLErrorHandler.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 from xml.sax.handler import ErrorHandler
-from xml.sax import SAXParseException
 
 from .XMLMessageDialog import XMLMessageDialog
 
--- a/E5XML/XMLHandlerBase.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/E5XML/XMLHandlerBase.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing a base class for all of eric5s XML handlers.
 """
 
-import sys
 import pickle
 import base64
 
--- a/Graphics/ApplicationDiagram.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Graphics/ApplicationDiagram.py	Sun Jan 31 17:11:22 2010 +0000
@@ -16,7 +16,6 @@
 from .UMLDialog import UMLDialog
 from .PackageItem import PackageItem, PackageModel
 from .AssociationItem import AssociationItem, Imports
-from . import GraphicsUtilities
 
 import Utilities.ModuleParser
 import Utilities
--- a/Graphics/AssociationItem.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Graphics/AssociationItem.py	Sun Jan 31 17:11:22 2010 +0000
@@ -163,7 +163,6 @@
         
         # find itemA region
         rc = QRectF(xA, yA, rectA.width(), rectA.height())
-        oldRegionA = self.regionA
         self.regionA = self.__findPointRegion(rc, xB, yB)
         # move some regions to the standard ones
         if self.regionA == NorthWest:
@@ -181,7 +180,6 @@
         
         # now do the same for itemB
         rc = QRectF(xB, yB, rectB.width(), rectB.height())
-        oldRegionB = self.regionB
         self.regionB = self.__findPointRegion(rc, xA, yA)
         # move some regions to the standard ones
         if self.regionB == NorthWest:
@@ -470,4 +468,4 @@
         Public method to unassociate from the widgets.
         """
         self.itemA.removeAssociation(self)
-        self.itemB.removeAssociation(self)
\ No newline at end of file
+        self.itemB.removeAssociation(self)
--- a/Graphics/GraphicsUtilities.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Graphics/GraphicsUtilities.py	Sun Jan 31 17:11:22 2010 +0000
@@ -76,7 +76,7 @@
         nodes = list(filter(lambda x, l = stage: x not in l, nodes))
         if nodelen == len(nodes):
             if noRecursion:
-                raise recursionError(nodes)
+                raise RecursionError(nodes)
             else:
                 stages.append(nodes[:])
                 nodes = []
--- a/Graphics/ImportsDiagram.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Graphics/ImportsDiagram.py	Sun Jan 31 17:11:22 2010 +0000
@@ -9,7 +9,6 @@
 
 import glob
 import os
-import sys
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
@@ -17,7 +16,6 @@
 from .UMLDialog import UMLDialog
 from .ModuleItem import ModuleItem, ModuleModel
 from .AssociationItem import AssociationItem, Imports
-from . import GraphicsUtilities
 
 import Utilities.ModuleParser
 import Utilities
--- a/Graphics/UMLGraphicsView.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Graphics/UMLGraphicsView.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,8 +7,6 @@
 Module implementing a subclass of E5GraphicsView for our diagrams.
 """
 
-import sys
-
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
@@ -485,4 +483,4 @@
                           (itemrect.y() + itemrect.height() // 2)
             item.moveBy(xOffset, yOffset)
         
-        self.scene().update()
\ No newline at end of file
+        self.scene().update()
--- a/Helpviewer/AdBlock/AdBlockManager.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/AdBlock/AdBlockManager.py	Sun Jan 31 17:11:22 2010 +0000
@@ -11,8 +11,6 @@
 
 from PyQt4.QtCore import *
 
-import Helpviewer.HelpWindow
-
 from .AdBlockNetwork import AdBlockNetwork
 from .AdBlockPage import AdBlockPage
 from .AdBlockSubscription import AdBlockSubscription
--- a/Helpviewer/AdBlock/AdBlockNetwork.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/AdBlock/AdBlockNetwork.py	Sun Jan 31 17:11:22 2010 +0000
@@ -34,7 +34,6 @@
         
         urlString = bytes(url.toEncoded()).decode()
         blockedRule = None
-        blockingSubscription = None
         
         for subscription in manager.subscriptions():
             if subscription.allow(urlString):
@@ -43,7 +42,6 @@
             rule = subscription.block(urlString)
             if rule is not None:
                 blockedRule = rule
-                blockingSubscription = subscription
                 break
         
         if blockedRule is not None:
--- a/Helpviewer/AdBlock/AdBlockPage.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/AdBlock/AdBlockPage.py	Sun Jan 31 17:11:22 2010 +0000
@@ -9,8 +9,6 @@
 
 from PyQt4.QtCore import *
 
-import Helpviewer.HelpWindow
-
 class AdBlockPage(QObject):
     """
     Class to apply AdBlock rules to a web page.
--- a/Helpviewer/Bookmarks/BookmarksToolBar.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/Bookmarks/BookmarksToolBar.py	Sun Jan 31 17:11:22 2010 +0000
@@ -15,12 +15,9 @@
 import Helpviewer.HelpWindow
 
 from .BookmarksModel import BookmarksModel
-from .BookmarkNode import BookmarkNode
 from .BookmarksMenu import BookmarksMenu
 from .AddBookmarkDialog import AddBookmarkDialog
 
-import UI.PixmapCache
-
 class BookmarksToolBar(E5ModelToolBar):
     """
     Class implementing a tool bar showing bookmarks.
@@ -177,4 +174,4 @@
                      self, SIGNAL("openUrl(const QUrl&, const QString&)"))
         self.connect(menu, SIGNAL("newUrl(const QUrl&, const QString&)"), 
                      self, SIGNAL("newUrl(const QUrl&, const QString&)"))
-        return menu
\ No newline at end of file
+        return menu
--- a/Helpviewer/CookieJar/CookieDetailsDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/CookieJar/CookieDetailsDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 from PyQt4.QtGui import QDialog
-from PyQt4.QtCore import pyqtSlot
 
 from .Ui_CookieDetailsDialog import Ui_CookieDetailsDialog
 
@@ -41,4 +40,4 @@
         self.pathEdit.setText(path)
         self.secureCheckBox.setChecked(secure)
         self.expirationEdit.setText(expires)
-        self.valueEdit.setPlainText(value)
\ No newline at end of file
+        self.valueEdit.setPlainText(value)
--- a/Helpviewer/CookieJar/CookieJar.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/CookieJar/CookieJar.py	Sun Jan 31 17:11:22 2010 +0000
@@ -87,7 +87,7 @@
         if version != self.JAR_VERSION:
             return []
         
-        noCookies = stream.readUInt32()
+        stream.readUInt32() # number of cookies
         
         rawCookie = QByteArray()
         while not stream.atEnd():
--- a/Helpviewer/CookieJar/CookiesConfigurationDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/CookieJar/CookiesConfigurationDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -16,8 +16,6 @@
 
 from .Ui_CookiesConfigurationDialog import Ui_CookiesConfigurationDialog
 
-import Preferences
-
 class CookiesConfigurationDialog(QDialog, Ui_CookiesConfigurationDialog):
     """
     Class implementing the cookies configuration dialog.
@@ -91,4 +89,4 @@
         Private slot to show the cookies dialog.
         """
         dlg = CookiesDialog(self.__mw.cookieJar())
-        dlg.exec_()
\ No newline at end of file
+        dlg.exec_()
--- a/Helpviewer/DownloadDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/DownloadDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -318,7 +318,6 @@
             return
         
         bytesTotal = self.progressBar.maximum()
-        running = not self.__downloadedSuccessfully()
         
         info = ""
         if self.__downloading():
@@ -382,15 +381,6 @@
         """
         return self.__stopButton.isEnabled()
     
-    def __downloadedSuccessfully(self):
-        """
-        Private method to determine the download status.
-        
-        @return download status (boolean)
-        """
-        return (not self.__stopButton.isEnabled() and \
-                not self.__tryAgainButton.isEnabled())
-    
     def __finished(self):
         """
         Private slot to handle the download finished.
--- a/Helpviewer/HelpBrowserWV.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/HelpBrowserWV.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,17 +8,12 @@
 Module implementing the helpbrowser using QWebView.
 """
 
-import os
-
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from PyQt4.QtWebKit import QWebView, QWebPage, QWebSettings
-from PyQt4.QtNetwork import QNetworkProxy, QNetworkAccessManager, QNetworkReply, \
-    QNetworkRequest
+from PyQt4.QtNetwork import QNetworkReply, QNetworkRequest
 
 import Preferences
-import Utilities
-import UI.PixmapCache
 
 from .DownloadDialog import DownloadDialog
 from .HelpWebSearchWidget import HelpWebSearchWidget
@@ -545,7 +540,6 @@
         
         @param evt reference to the context menu event object (QContextMenuEvent)
         """
-        pos = evt.pos()
         menu = QMenu(self)
         
         hit = self.page().mainFrame().hitTestContent(evt.pos())
--- a/Helpviewer/HelpClearPrivateDataDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/HelpClearPrivateDataDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 from PyQt4.QtGui import QDialog
-from PyQt4.QtCore import pyqtSlot, qVersion
 
 from .Ui_HelpClearPrivateDataDialog import Ui_HelpClearPrivateDataDialog
 
@@ -37,4 +36,4 @@
                 self.iconsCheckBox.isChecked(), 
                 self.cacheCheckBox.isChecked(), 
                 self.cookiesCheckBox.isChecked(), 
-                self.passwordsCheckBox.isChecked())
\ No newline at end of file
+                self.passwordsCheckBox.isChecked())
--- a/Helpviewer/HelpTopicDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/HelpTopicDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,7 @@
 """
 
 from PyQt4.QtGui import QDialog
-from PyQt4.QtCore import pyqtSlot, SIGNAL, QUrl
+from PyQt4.QtCore import SIGNAL, QUrl
 
 from .Ui_HelpTopicDialog import Ui_HelpTopicDialog
 
@@ -55,4 +55,4 @@
         if topic == "" or topic not in self.__links:
             return QUrl()
         
-        return self.__links[topic]
\ No newline at end of file
+        return self.__links[topic]
--- a/Helpviewer/HelpWebSearchWidget.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/HelpWebSearchWidget.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,9 +7,6 @@
 Module implementing a web search widget for the web browser.
 """
 
-import os
-import imp
-
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from PyQt4.QtWebKit import QWebSettings
@@ -400,4 +397,4 @@
         """
         osm = HelpWebSearchWidget.openSearchManager()
         self.__engineButton.setIcon(
-            QIcon(QPixmap.fromImage(osm.currentEngine().image())))
\ No newline at end of file
+            QIcon(QPixmap.fromImage(osm.currentEngine().image())))
--- a/Helpviewer/HelpWindow.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/HelpWindow.py	Sun Jan 31 17:11:22 2010 +0000
@@ -11,7 +11,6 @@
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
-from PyQt4.QtNetwork import QNetworkProxy
 from PyQt4.QtWebKit import QWebSettings
 from PyQt4.QtHelp import QHelpEngine, QHelpEngineCore, QHelpSearchQuery
 
@@ -2820,4 +2819,4 @@
         if cls._adblockManager is None:
             cls._adblockManager = AdBlockManager()
         
-        return cls._adblockManager
\ No newline at end of file
+        return cls._adblockManager
--- a/Helpviewer/Network/NetworkAccessManager.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/Network/NetworkAccessManager.py	Sun Jan 31 17:11:22 2010 +0000
@@ -20,12 +20,10 @@
     SSL_AVAILABLE = False
 
 from UI.AuthenticationDialog import AuthenticationDialog
-import UI.PixmapCache
 
 from Helpviewer.HelpLanguagesDialog import HelpLanguagesDialog
 import Helpviewer.HelpWindow
 
-from .NetworkReply import NetworkReply
 from .NetworkProtocolUnknownErrorReply import NetworkProtocolUnknownErrorReply
 from .NetworkDiskCache import NetworkDiskCache
 
--- a/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,7 @@
 """
 
 from PyQt4.QtCore import *
-from PyQt4.QtNetwork import QNetworkReply, QNetworkRequest
+from PyQt4.QtNetwork import QNetworkReply
 
 class NetworkProtocolUnknownErrorReply(QNetworkReply):
     """
--- a/Helpviewer/OpenSearch/OpenSearchDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/OpenSearch/OpenSearchDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -10,8 +10,6 @@
 from PyQt4.QtGui import QDialog, QFileDialog, QMessageBox
 from PyQt4.QtCore import pyqtSlot, SIGNAL
 
-from E5Gui.E5ListView import E5ListView
-
 from Helpviewer.HelpWebSearchWidget import HelpWebSearchWidget
 
 from .OpenSearchEngineModel import OpenSearchEngineModel
@@ -110,4 +108,4 @@
         @param deselected item selection of deselected items (QItemSelection)
         """
         self.editButton.setEnabled(
-            len(self.enginesTable.selectionModel().selectedRows()) <= 1)
\ No newline at end of file
+            len(self.enginesTable.selectionModel().selectedRows()) <= 1)
--- a/Helpviewer/Passwords/PasswordManager.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Helpviewer/Passwords/PasswordManager.py	Sun Jan 31 17:11:22 2010 +0000
@@ -379,7 +379,7 @@
             neverButton = mb.addButton(
                 self.trUtf8("Never for this site"), QMessageBox.DestructiveRole)
             noButton = mb.addButton(self.trUtf8("Not now"), QMessageBox.RejectRole)
-            yesButton = mb.addButton(QMessageBox.Yes)
+            mb.addButton(QMessageBox.Yes)
             mb.exec_()
             if mb.clickedButton() == neverButton:
                 self.__never.append(url.toString())
@@ -392,7 +392,6 @@
         password = ""
         for index in range(len(form.elements)):
             element = form.elements[index]
-            name = element[0].lower()
             type_ = form.elementTypes[element[0]]
             if user == "" and \
                type_ == "text":
--- a/IconEditor/IconEditorWindow.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/IconEditor/IconEditorWindow.py	Sun Jan 31 17:11:22 2010 +0000
@@ -21,8 +21,6 @@
 
 import Preferences
 
-from eric5config import getConfig
-
 class IconEditorWindow(QMainWindow):
     """
     Class implementing the web browser main window.
@@ -1246,4 +1244,4 @@
         """
         Private slot called in to enter Whats This mode.
         """
-        QWhatsThis.enterWhatsThisMode()
\ No newline at end of file
+        QWhatsThis.enterWhatsThisMode()
--- a/IconEditor/IconSizeDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/IconEditor/IconSizeDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -5,7 +5,6 @@
 """
 
 from PyQt4.QtGui import QDialog
-from PyQt4.QtCore import pyqtSlot
 
 from .Ui_IconSizeDialog import Ui_IconSizeDialog
 
@@ -35,4 +34,4 @@
         
         @return tuple with width and height (tuple of two integers)
         """
-        return self.widthSpin.value(), self.heightSpin.value()
\ No newline at end of file
+        return self.widthSpin.value(), self.heightSpin.value()
--- a/MultiProject/MultiProject.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/MultiProject/MultiProject.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,14 +8,11 @@
 """
 
 import os
-import sys
 import io
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from E5Gui.E5Application import e5App
-
 from Globals import recentNameMultiProject
 
 from .PropertiesDialog import PropertiesDialog
@@ -602,7 +599,7 @@
                     return False
                 
             self.name = QFileInfo(fn).baseName()
-            ok = self.__writeMultiProject(fn)
+            self.__writeMultiProject(fn)
             
             self.emit(SIGNAL('multiProjectClosed'))
             self.emit(SIGNAL('multiProjectOpened'))
@@ -978,4 +975,4 @@
         for project in self.projects:
             if not project['master']:
                 files.append(project['file'])
-        return files
\ No newline at end of file
+        return files
--- a/PluginManager/PluginInstallDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/PluginManager/PluginInstallDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -17,8 +17,6 @@
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
 
-from E5Gui.E5Completers import E5FileCompleter
-
 from .PluginManager import PluginManager
 from .Ui_PluginInstallDialog import Ui_PluginInstallDialog
 
@@ -371,7 +369,6 @@
         self.__installedFiles = []
         try:
             if packageName != "None":
-                packageDirs = ["%s/" % packageName, "%s\\" % packageName]
                 namelist = sorted(zip.namelist())
                 tot = len(namelist)
                 prog = 0
--- a/Plugins/AboutPlugin/AboutDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/AboutPlugin/AboutDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,9 +7,6 @@
 Module implementing an 'About Eric' dialog.
 """
 
-import sys
-
-from PyQt4.QtCore import Qt, SIGNAL
 from PyQt4.QtGui import QApplication
 
 from UI.Info import *
@@ -725,8 +722,6 @@
                      END OF TERMS AND CONDITIONS""".format(Copyright)
 
 
-import os
-
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
 
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,9 +7,7 @@
 Module implementing a simple Python syntax checker.
 """
 
-import sys
 import os
-import types
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
--- a/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py	Sun Jan 31 17:11:22 2010 +0000
@@ -41,7 +41,6 @@
 __version__ = "6_eric"
 
 import os
-import sys
 import tokenize
 import io
 
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,9 +7,7 @@
 Module implementing a dialog to show the output of the tabnanny command process.
 """
 
-import sys
 import os
-import types
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
@@ -142,4 +140,4 @@
         fn = Utilities.normabspath(itm.text(0))
         lineno = int(itm.text(1))
         
-        e5App().getObject("ViewManager").openSourceFile(fn, lineno)
\ No newline at end of file
+        e5App().getObject("ViewManager").openSourceFile(fn, lineno)
--- a/Plugins/PluginEricapi.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/PluginEricapi.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,8 +8,6 @@
 """
 
 import os
-import sys
-import copy
 
 from PyQt4.QtCore import QObject, SIGNAL
 from PyQt4.QtGui import QDialog, QApplication
@@ -161,7 +159,7 @@
                 if "%L" in outputFileName:
                     outfile = outputFileName.replace("%L", progLanguage)
                 else:
-                    if len(progLanguages) == 1:
+                    if len(parms['languages']) == 1:
                         outfile = outputFileName
                     else:
                         root, ext = os.path.splitext(outputFileName)
@@ -171,4 +169,4 @@
                 if outfile not in project.pdata['OTHERS']:
                     project.pdata['OTHERS'].append(outfile)
                     project.setDirty(True)
-                    project.othersAdded(outfile)
\ No newline at end of file
+                    project.othersAdded(outfile)
--- a/Plugins/PluginEricdoc.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/PluginEricdoc.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,8 +8,6 @@
 """
 
 import os
-import sys
-import copy
 
 from PyQt4.QtCore import QObject, SIGNAL
 from PyQt4.QtGui import QDialog, QApplication
@@ -177,4 +175,4 @@
                 if outdir not in project.pdata['OTHERS']:
                     project.pdata['OTHERS'].append(outdir)
                     project.setDirty(True)
-                    project.othersAdded(outdir)
\ No newline at end of file
+                    project.othersAdded(outdir)
--- a/Plugins/PluginVcsPySvn.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/PluginVcsPySvn.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 import os
-import sys
 
 from PyQt4.QtGui import QApplication
 
@@ -230,4 +229,4 @@
         """
         Public method to prepare for an uninstallation.
         """
-        e5App().unregisterPluginObject(pluginTypename)
\ No newline at end of file
+        e5App().unregisterPluginObject(pluginTypename)
--- a/Plugins/PluginVcsSubversion.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/PluginVcsSubversion.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 import os
-import sys
 
 from PyQt4.QtGui import QApplication
 
@@ -232,4 +231,4 @@
         """
         Public method to prepare for an uninstallation.
         """
-        e5App().unregisterPluginObject(pluginTypename)
\ No newline at end of file
+        e5App().unregisterPluginObject(pluginTypename)
--- a/Plugins/PluginVmMdiArea.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/PluginVmMdiArea.py	Sun Jan 31 17:11:22 2010 +0000
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import QT_TRANSLATE_NOOP, qVersion
+from PyQt4.QtCore import QT_TRANSLATE_NOOP
 from PyQt4.QtGui import QPixmap
 
 # Start-Of-Header
--- a/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 import os
-import sys
 
 import pysvn
 
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,8 +7,6 @@
 Module implementing a dialog to show the output of a pysvn action.
 """
 
-import os
-
 import pysvn
 
 from PyQt4.QtCore import *
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py	Sun Jan 31 17:11:22 2010 +0000
@@ -114,8 +114,7 @@
                                       QMessageBox.AcceptRole)
         tempButton = msgBox.addButton(self.trUtf8("&Temporary accept"), 
                                       QMessageBox.AcceptRole)
-        rejectButton = msgBox.addButton(self.trUtf8("&Reject"), 
-                                        QMessageBox.RejectRole)
+        msgBox.addButton(self.trUtf8("&Reject"), QMessageBox.RejectRole)
         msgBox.exec_()
         if cursor is not None:
             QApplication.setOverrideCursor(cursor)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,8 +8,6 @@
 """
 
 import os
-import sys
-import types
 
 import pysvn
 
@@ -362,4 +360,4 @@
         """
         self.errorGroup.show()
         self.errors.insertPlainText(msg)
-        self.errors.ensureCursorVisible()
\ No newline at end of file
+        self.errors.ensureCursorVisible()
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -220,6 +220,7 @@
         cwd = os.getcwd()
         os.chdir(self.dname)
         try:
+            nextRev = 0
             fetched = 0
             logs = []
             while fetched < limit:
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 import os
-import sys
 
 import pysvn
 
@@ -96,6 +95,7 @@
         cwd = os.getcwd()
         os.chdir(dname)
         try:
+            nextRev = 0
             fetched = 0
             logs = []
             limit = noEntries or 9999999
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 import os
-import types
 
 import pysvn
 
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing a dialog to show the output of the svn status command process.
 """
 
-import types
 import os
 
 import pysvn
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py	Sun Jan 31 17:11:22 2010 +0000
@@ -11,8 +11,6 @@
 
 import pysvn
 
-from PyQt4.QtCore import QRegExp
-
 from VCS.StatusMonitorThread import VcsStatusMonitorThread
 
 import Preferences
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing some common utility functions for the pysvn package.
 """
 
-import sys
 import os
 
 from PyQt4.QtCore import QDateTime, Qt
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sun Jan 31 17:11:22 2010 +0000
@@ -9,7 +9,6 @@
 
 import os
 import shutil
-import types
 import urllib.request, urllib.parse, urllib.error
 import time
 
@@ -48,7 +47,6 @@
 from .SvnStatusMonitorThread import SvnStatusMonitorThread
 
 from .ProjectBrowserHelper import SvnProjectBrowserHelper
-from .ProjectHelper import SvnProjectHelper
 
 from Plugins.VcsPlugins.vcsSubversion.SvnDialog import SvnDialog as SvnProcessDialog
 
@@ -382,7 +380,7 @@
             QApplication.processEvents()
         locker = QMutexLocker(self.vcsExecutionMutex)
         try:
-            rev = client.checkout(url, projectDir, recurse)
+            client.checkout(url, projectDir, recurse)
             status = True
         except pysvn.ClientError as e:
             status = False
@@ -443,7 +441,7 @@
         QApplication.processEvents()
         locker = QMutexLocker(self.vcsExecutionMutex)
         try:
-            rev = client.export(url, projectDir, force = True, recurse = recurse)
+            client.export(url, projectDir, force = True, recurse = recurse)
             status = True
         except pysvn.ClientError as e:
             status = False
@@ -583,7 +581,7 @@
                     client)
         QApplication.processEvents()
         try:
-            revlist = client.update(fnames, recurse)
+            client.update(fnames, recurse)
         except pysvn.ClientError as e:
             dlg.showError(e.args[0])
         locker.unlock()
@@ -1263,7 +1261,7 @@
                         self.statusCache[name] = self.canBeCommitted
                     else:
                         self.statusCache[name] = self.canBeAdded
-            except pysvn.ClientError as e:
+            except pysvn.ClientError:
                 locker.unlock()    # ignore pysvn errors
         
         return names
@@ -1296,7 +1294,7 @@
         QApplication.processEvents()
         locker = QMutexLocker(self.vcsExecutionMutex)
         try:
-            rev = client.cleanup(name)
+            client.cleanup(name)
         except pysvn.ClientError as e:
             dlg.showError(e.args[0])
         locker.unlock()
@@ -1408,9 +1406,11 @@
         locker = QMutexLocker(self.vcsExecutionMutex)
         try:
             entry = client.info(path)
-            return entry.url
+            url = entry.url
         except pysvn.ClientError:
-            return None
+            url = None
+        locker.unlock()
+        return url
 
     def svnResolve(self, name):
         """
@@ -1439,7 +1439,7 @@
         QApplication.processEvents()
         try:
             for name in fnames:
-                rev = client.resolved(name, recurse = recurse)
+                client.resolved(name, recurse = recurse)
         except pysvn.ClientError as e:
             dlg.showError(e.args[0])
         locker.unlock()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,8 +7,6 @@
 Module implementing a dialog to show the output of the svn blame command.
 """
 
-import sys
-
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,8 +8,6 @@
 """
 
 import os
-import sys
-import types
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
@@ -364,4 +362,4 @@
             self.intercept = False
             evt.accept()
             return
-        QWidget.keyPressEvent(self, evt)
\ No newline at end of file
+        QWidget.keyPressEvent(self, evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 import os
-import sys
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,8 +7,6 @@
 Module implementing a dialog to show the output of the svn proplist command process.
 """
 
-import types
-
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing a dialog to show the output of the svn status command process.
 """
 
-import types
 import os
 
 from PyQt4.QtCore import *
@@ -709,4 +708,4 @@
         for itm in self.statusList.selectedItems():
             if itm.text(self.__changelistColumn) == "":
                 clitems.append(itm)
-        return clitems
\ No newline at end of file
+        return clitems
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUtilities.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnUtilities.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,11 +7,8 @@
 Module implementing some common utility functions for the subversion package.
 """
 
-import sys
 import os
 
-from PyQt4.QtCore import QDateTime, Qt
-
 import Utilities
 
 def getServersPath():
@@ -38,4 +35,4 @@
         return os.path.join(appdata, "Subversion", "config")
     else:
         homedir = Utilities.getHomeDir()
-        return os.path.join(homedir, ".subversion", "config")
\ No newline at end of file
+        return os.path.join(homedir, ".subversion", "config")
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sun Jan 31 17:11:22 2010 +0000
@@ -9,7 +9,6 @@
 
 import os
 import shutil
-import types
 import urllib.request, urllib.parse, urllib.error
 
 from PyQt4.QtCore import *
@@ -43,7 +42,6 @@
 from .SvnStatusMonitorThread import SvnStatusMonitorThread
 
 from .ProjectBrowserHelper import SvnProjectBrowserHelper
-from .ProjectHelper import SvnProjectHelper
 
 import Preferences
 import Utilities
@@ -282,7 +280,7 @@
                 shutil.copytree(projectDir, os.path.join(tmpDir, project, 'trunk'))
             else:
                 shutil.copytree(projectDir, os.path.join(tmpDir, project))
-        except OSError as e:
+        except OSError:
             if os.path.isdir(tmpDir):
                 shutil.rmtree(tmpDir, True)            
             return False, False
@@ -708,7 +706,6 @@
                 target, force = dlg.getData()
         
         if accepted:
-            isdir = os.path.isdir(name)
             args = []
             args.append('move')
             self.addArguments(args, opts)
--- a/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -12,8 +12,6 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from E5Gui.E5Application import e5App
-
 from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
 
 from .Ui_FileDialogWizardDialog import Ui_FileDialogWizardDialog
@@ -291,4 +289,4 @@
         @param indString string used for indentation (space or tab) (string)
         @return generated code (string)
         """
-        return self.__getCode4(indLevel, indString)
\ No newline at end of file
+        return self.__getCode4(indLevel, indString)
--- a/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -88,11 +88,7 @@
         @param indString string used for indentation (space or tab) (string)
         @return generated code (string)
         """
-        # calculate our indentation level and the indentation string
-        il = indLevel + 1
-        istring = il * indString
-        
-        # now generate the code
+        # generate the code
         code = 'QFontDialog.getFont('
         if not self.eVariable.text():
             if self.font is not None:
--- a/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -12,8 +12,6 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from E5Gui.E5Application import e5App
-
 from .Ui_InputDialogWizardDialog import Ui_InputDialogWizardDialog
 
 class InputDialogWizardDialog(QDialog, Ui_InputDialogWizardDialog):
@@ -194,4 +192,4 @@
         @param indString string used for indentation (space or tab) (string)
         @return generated code (string)
         """
-        return self.__getCode4(indLevel, indString)
\ No newline at end of file
+        return self.__getCode4(indLevel, indString)
--- a/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -12,8 +12,6 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from E5Gui.E5Application import e5App
-
 from .Ui_MessageBoxWizardDialog import Ui_MessageBoxWizardDialog
 
 class MessageBoxWizardDialog(QDialog, Ui_MessageBoxWizardDialog):
@@ -318,4 +316,4 @@
         if not self.rAbout.isChecked() and not self.rAboutQt.isChecked():
             msgdlg += self.__getQt42ButtonCode(istring, indString)
         msgdlg +=')%s' % os.linesep
-        return msgdlg
\ No newline at end of file
+        return msgdlg
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing the Python re wizard dialog.
 """
 
-import sys
 import os
 import re
 
@@ -377,7 +376,7 @@
         if regex:
             try:
                 if self.py2Button.isChecked():
-                    regobj = re.compile(regex,
+                    re.compile(regex,
                         (not self.caseSensitiveCheckBox.isChecked() and re.IGNORECASE or 0) | \
                         self.multilineCheckBox.isChecked() and re.MULTILINE or 0 | \
                         self.dotallCheckBox.isChecked() and re.DOTALL or 0 | \
@@ -385,7 +384,7 @@
                         self.localeCheckBox.isChecked() and re.LOCALE or 0 | \
                         self.unicodeCheckBox.isChecked() and re.UNICODE or 0)
                 else:
-                    regobj = re.compile(regex,
+                    re.compile(regex,
                         (not self.caseSensitiveCheckBox.isChecked() and re.IGNORECASE or 0) | \
                         self.multilineCheckBox.isChecked() and re.MULTILINE or 0 | \
                         self.dotallCheckBox.isChecked() and re.DOTALL or 0 | \
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py	Sun Jan 31 16:15:16 2010 +0000
+++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py	Sun Jan 31 17:11:22 2010 +0000
@@ -7,14 +7,11 @@
 Module implementing the QRegExp wizard dialog.
 """
 
-import sys
 import os
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from E5Gui.E5Application import e5App
-
 from .Ui_QRegExpWizardDialog import Ui_QRegExpWizardDialog
 
 from .QRegExpWizardRepeatDialog import QRegExpWizardRepeatDialog
@@ -76,7 +73,6 @@
         if fromEric:
             self.buttonBox.button(QDialogButtonBox.Close).hide()
             self.copyButton = None
-            uitype = e5App().getObject("Project").getProjectType()
         else:
             self.copyButton = \
                 self.buttonBox.addButton(self.trUtf8("Copy"), QDialogButtonBox.ActionRole)
@@ -529,4 +525,4 @@
         self.resize(size)
         
         self.connect(self.cw.buttonBox, SIGNAL("accepted()"), self.close)
-        self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.close)
\ No newline at end of file
+        self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.close)

eric ide

mercurial