Mercurial Repositories > eric / changeset

--- a/DebugClients/Python3/DebugBase.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/DebugClients/Python3/DebugBase.py	Sun Jan 31 18:31:28 2010 +0000
@@ -23,7 +23,6 @@
     
     @param s data to be printed
     """
-    import sys
     sys.__stderr__.write('{0!s}\n'.format(s))
     sys.__stderr__.flush()
 

--- a/Preferences/ConfigurationDialog.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationDialog.py	Sun Jan 31 18:31:28 2010 +0000
@@ -288,7 +288,6 @@
             }
         
         # generate the list entries
-        itemsToExpand = []
         for key in sorted(self.configItems.keys()):
             pageData = self.configItems[key]
             if pageData[3]:
@@ -566,8 +565,7 @@
             self.configStack.removeWidget(currentPage)
             if pageName == "editorHighlightingStylesPage":
                 self.__initLexers()
-            pageData = self.configItems[pageName]
-            pageData[-1] = None
+            self.configItems[pageName][-1] = None
             
             self.showConfigurationPageByName(pageName)
             if savedState is not None:

--- a/Preferences/ConfigurationPages/ApplicationPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/ApplicationPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,10 +7,6 @@
 Module implementing the Application configuration page.
 """
 
-import os
-
-from PyQt4.QtCore import pyqtSlot
-
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_ApplicationPage import Ui_ApplicationPage
 

--- a/Preferences/ConfigurationPages/CorbaPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/CorbaPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,7 @@
 Module implementing the Corba configuration page.
 """
 
-from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QFileDialog
 
 from E5Gui.E5Completers import E5FileCompleter
@@ -62,4 +62,4 @@
     @param dlg reference to the configuration dialog
     """
     page = CorbaPage()
-    return page
\ No newline at end of file
+    return page

--- a/Preferences/ConfigurationPages/DebuggerPython3Page.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/DebuggerPython3Page.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,7 @@
 Module implementing the Debugger Python3 configuration page.
 """
 
-from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QFileDialog
 
 from E5Gui.E5Completers import E5FileCompleter
@@ -115,4 +115,4 @@
     @param dlg reference to the configuration dialog
     """
     page = DebuggerPython3Page()
-    return page
\ No newline at end of file
+    return page

--- a/Preferences/ConfigurationPages/DebuggerPythonPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/DebuggerPythonPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,7 @@
 Module implementing the Debugger Python configuration page.
 """
 
-from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QFileDialog
 
 from E5Gui.E5Completers import E5FileCompleter
@@ -111,4 +111,4 @@
     @param dlg reference to the configuration dialog
     """
     page = DebuggerPythonPage()
-    return page
\ No newline at end of file
+    return page

--- a/Preferences/ConfigurationPages/DebuggerRubyPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/DebuggerRubyPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,7 @@
 Module implementing the Debugger Ruby configuration page.
 """
 
-from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QFileDialog
 
 from E5Gui.E5Completers import E5FileCompleter
@@ -68,4 +68,4 @@
     @param dlg reference to the configuration dialog
     """
     page = DebuggerRubyPage()
-    return page
\ No newline at end of file
+    return page

--- a/Preferences/ConfigurationPages/EditorGeneralPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/EditorGeneralPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,8 +7,6 @@
 Module implementing the Editor General configuration page.
 """
 
-import QScintilla.Lexers
-
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorGeneralPage import Ui_EditorGeneralPage
 

--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,7 @@
 Module implementing the Editor Highlighting Styles configuration page.
 """
 
-import os
+import io
 
 from PyQt4.QtCore import pyqtSlot, QFileInfo
 from PyQt4.QtGui import QPalette, QFileDialog, QColorDialog, QFontDialog, \
@@ -324,7 +324,7 @@
         try:
             f = open(fn, "r", encoding = "utf-8")
             try:
-                line = f.readline()
+                f.readline()
                 dtdLine = f.readline()
             finally:
                 f.close()
@@ -354,7 +354,7 @@
                     parser.parse(f)
                 except UnicodeEncodeError:
                     f.seek(0)
-                    buf = cStringIO.StringIO(f.read())
+                    buf = io.StringIO(f.read())
                     parser.parse(buf)
             finally:
                 f.close()
@@ -420,4 +420,4 @@
     @param dlg reference to the configuration dialog
     """
     page = EditorHighlightingStylesPage(dlg.getLexers())
-    return page
\ No newline at end of file
+    return page

--- a/Preferences/ConfigurationPages/EditorPropertiesPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/EditorPropertiesPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,8 +7,6 @@
 Module implementing the Editor Properties configuration page.
 """
 
-from PyQt4.Qsci import QsciScintilla
-
 from QScintilla.QsciScintillaCompat import QSCINTILLA_VERSION
 
 from .ConfigurationPageBase import ConfigurationPageBase

--- a/Preferences/ConfigurationPages/EditorSearchPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/EditorSearchPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 from PyQt4.QtCore import pyqtSlot
-from PyQt4.QtGui import QPixmap, QIcon
 
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorSearchPage import Ui_EditorSearchPage

--- a/Preferences/ConfigurationPages/EditorSpellCheckingPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/EditorSpellCheckingPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -8,7 +8,7 @@
 """
 
 from PyQt4.QtCore import pyqtSlot
-from PyQt4.QtGui import QPixmap, QIcon, QFileDialog
+from PyQt4.QtGui import QFileDialog
 
 from E5Gui.E5Completers import E5FileCompleter
 
@@ -140,4 +140,4 @@
     @param dlg reference to the configuration dialog
     """
     page = EditorSpellCheckingPage()
-    return page
\ No newline at end of file
+    return page

--- a/Preferences/ConfigurationPages/EditorStylesPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/EditorStylesPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -8,11 +8,8 @@
 """
 
 from PyQt4.QtCore import pyqtSlot
-from PyQt4.QtGui import QPixmap, QIcon
 from PyQt4.Qsci import QsciScintilla
 
-from QScintilla.QsciScintillaCompat import QSCINTILLA_VERSION
-
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorStylesPage import Ui_EditorStylesPage
 

--- a/Preferences/ConfigurationPages/HelpAppearancePage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/HelpAppearancePage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,7 @@
 Module implementing the Help Viewers configuration page.
 """
 
-from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QFileDialog
 
 from E5Gui.E5Completers import E5FileCompleter
@@ -116,4 +116,4 @@
     @param dlg reference to the configuration dialog
     """
     page = HelpAppearancePage()
-    return page
\ No newline at end of file
+    return page

--- a/Preferences/ConfigurationPages/HelpDocumentationPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/HelpDocumentationPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,7 @@
 Module implementing the Help Documentation configuration page.
 """
 
-from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QFileDialog
 
 from E5Gui.E5Completers import E5DirCompleter
@@ -131,4 +131,4 @@
     @param dlg reference to the configuration dialog
     """
     page = HelpDocumentationPage()
-    return page
\ No newline at end of file
+    return page

--- a/Preferences/ConfigurationPages/HelpViewersPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/HelpViewersPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,7 @@
 Module implementing the Help Viewers configuration page.
 """
 
-from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QButtonGroup, QFileDialog
 
 from E5Gui.E5Completers import E5FileCompleter
@@ -130,4 +130,4 @@
     @param dlg reference to the configuration dialog
     """
     page = HelpViewersPage()
-    return page
\ No newline at end of file
+    return page

--- a/Preferences/ConfigurationPages/HelpWebBrowserPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/HelpWebBrowserPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -12,8 +12,6 @@
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_HelpWebBrowserPage import Ui_HelpWebBrowserPage
 
-import Helpviewer.HelpWindow
-
 import Preferences
 
 class HelpWebBrowserPage(ConfigurationPageBase, Ui_HelpWebBrowserPage):

--- a/Preferences/ConfigurationPages/IconsPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/IconsPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,7 @@
 Module implementing the Icons configuration page.
 """
 
-from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QListWidgetItem, QFileDialog
 
 from E5Gui.E5Completers import E5DirCompleter
@@ -174,4 +174,4 @@
     @param dlg reference to the configuration dialog
     """
     page = IconsPage()
-    return page
\ No newline at end of file
+    return page

--- a/Preferences/ConfigurationPages/PluginManagerPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/PluginManagerPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QFileDialog
 
 from E5Gui.E5Completers import E5DirCompleter
@@ -73,4 +73,4 @@
     @param dlg reference to the configuration dialog
     """
     page = PluginManagerPage()
-    return page
\ No newline at end of file
+    return page

--- a/Preferences/ConfigurationPages/ProjectBrowserPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/ProjectBrowserPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -16,7 +16,7 @@
 
 from Project.ProjectBrowserFlags import SourcesBrowserFlag, FormsBrowserFlag, \
     ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \
-    OthersBrowserFlag, AllBrowsersFlag
+    OthersBrowserFlag
 
 import Preferences
 
@@ -147,4 +147,4 @@
     @param dlg reference to the configuration dialog
     """
     page = ProjectBrowserPage()
-    return page
\ No newline at end of file
+    return page

--- a/Preferences/ConfigurationPages/QtPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/QtPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -9,7 +9,7 @@
 
 import sys
 
-from PyQt4.QtCore import QDir, pyqtSlot
+from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QFileDialog
 
 from E5Gui.E5Completers import E5DirCompleter
@@ -115,4 +115,4 @@
     @param dlg reference to the configuration dialog
     """
     page = QtPage()
-    return page
\ No newline at end of file
+    return page

--- a/Preferences/ConfigurationPages/TasksPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/TasksPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 from PyQt4.QtCore import pyqtSlot
-from PyQt4.QtGui import QPixmap, QIcon
 
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_TasksPage import Ui_TasksPage

--- a/Preferences/ConfigurationPages/TerminalPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/TerminalPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,8 +7,6 @@
 Module implementing the Terminal configuration page.
 """
 
-import sys
-
 from PyQt4.QtCore import pyqtSlot
 
 from .ConfigurationPageBase import ConfigurationPageBase

--- a/Preferences/ConfigurationPages/ViewmanagerPage.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ConfigurationPages/ViewmanagerPage.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,10 +7,7 @@
 Module implementing the Viewmanager configuration page.
 """
 
-import os
-
 from PyQt4.QtCore import pyqtSlot
-from PyQt4.QtGui import QPixmap
 
 from E5Gui.E5Application import e5App
 
@@ -19,8 +16,6 @@
 
 import Preferences
 
-from eric5config import getConfig
-
 class ViewmanagerPage(ConfigurationPageBase, Ui_ViewmanagerPage):
     """
     Class implementing the Viewmanager configuration page.
@@ -91,4 +86,4 @@
     @param dlg reference to the configuration dialog
     """
     page = ViewmanagerPage()
-    return page
\ No newline at end of file
+    return page

--- a/Preferences/PreferencesLexer.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/PreferencesLexer.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,11 +7,9 @@
 Module implementing a special QextScintilla lexer to handle the preferences.
 """
 
-import sys
-
 from PyQt4.QtCore import *
 from PyQt4.QtGui import QColor, QFont, QApplication
-from PyQt4.Qsci import QsciLexer, QsciScintilla
+from PyQt4.Qsci import QsciLexer
 
 import QScintilla.Lexers
 

--- a/Preferences/ProgramsDialog.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ProgramsDialog.py	Sun Jan 31 18:31:28 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 import os
-import sys
 import re
 
 from PyQt4.QtCore import pyqtSlot, Qt, QProcess
@@ -248,7 +247,7 @@
                                 break
                     else:
                         version = self.trUtf8("(not executable)")
-                itm2 = QTreeWidgetItem(itm, [exe, version])
+                QTreeWidgetItem(itm, [exe, version])
                 itm.setExpanded(True)
             else:
                 itm.setText(1, self.trUtf8("(not found)"))
@@ -271,10 +270,10 @@
         itm.setFont(0, font)
         
         if len(entryVersion):
-            itm2 = QTreeWidgetItem(itm, [entryText, entryVersion])
+            QTreeWidgetItem(itm, [entryText, entryVersion])
             itm.setExpanded(True)
         else:
             itm.setText(1, self.trUtf8("(not found)"))
         QApplication.processEvents()
         self.programsList.header().resizeSections(QHeaderView.ResizeToContents)
-        self.programsList.header().setStretchLastSection(True)
\ No newline at end of file
+        self.programsList.header().setStretchLastSection(True)

--- a/Preferences/Shortcuts.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/Shortcuts.py	Sun Jan 31 18:31:28 2010 +0000
@@ -240,7 +240,7 @@
         else:
             f = open(fn, "r", encoding = "utf-8")
         try:
-            line = f.readline()
+            f.readline()
             dtdLine = f.readline()
         finally:
             f.close()

--- a/Preferences/ToolConfigurationDialog.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ToolConfigurationDialog.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,8 +7,6 @@
 Module implementing a configuration dialog for the tools menu.
 """
 
-import sys
-import os
 import copy
 
 from PyQt4.QtCore import *
@@ -389,4 +387,4 @@
         """
         tmp = self.toollist[itm1]
         self.toollist[itm1] = self.toollist[itm2]
-        self.toollist[itm2] = tmp
\ No newline at end of file
+        self.toollist[itm2] = tmp

--- a/Preferences/ToolGroupConfigurationDialog.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Preferences/ToolGroupConfigurationDialog.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,15 +7,12 @@
 Module implementing a configuration dialog for the tools menu.
 """
 
-import sys
-import os
 import copy
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
 from .Ui_ToolGroupConfigurationDialog import Ui_ToolGroupConfigurationDialog
-import Utilities
 
 class ToolGroupConfigurationDialog(QDialog, Ui_ToolGroupConfigurationDialog):
     """

--- a/Project/CreateDialogCodeDialog.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Project/CreateDialogCodeDialog.py	Sun Jan 31 18:31:28 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 import os
-import sys
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
@@ -462,4 +461,4 @@
         """
         if button == self.okButton:
             self.__generateCode()
-            self.accept()
\ No newline at end of file
+            self.accept()

--- a/Project/FiletypeAssociationDialog.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Project/FiletypeAssociationDialog.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,9 +7,6 @@
 Module implementing a dialog to enter filetype associations for the project.
 """
 
-import sys
-import os
-
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
@@ -46,7 +43,7 @@
         for pattern, filetype in list(self.project.pdata["FILETYPES"].items()):
             try:
                 index = self.filetypes.index(filetype)
-                itm = self.__createItem(pattern, self.filetypeStrings[index])
+                self.__createItem(pattern, self.filetypeStrings[index])
             except ValueError:
                 pass    # silently discard entries of unknown type
         

--- a/Project/Project.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Project/Project.py	Sun Jan 31 18:31:28 2010 +0000
@@ -8,8 +8,6 @@
 """
 
 import os
-import sys
-import re
 import time
 import shutil
 import glob
@@ -69,8 +67,6 @@
 import Preferences
 import Utilities
 
-from eric5config import getConfig
-
 class Project(QObject):
     """
     Class implementing the project management functionality.
@@ -884,7 +880,7 @@
             
         # now read the file
         if line.startswith('<?xml'):
-            res = self.__readXMLSession(fn, dtdLine.startswith("<!DOCTYPE"), quiet)
+            self.__readXMLSession(fn, dtdLine.startswith("<!DOCTYPE"), quiet)
         else:
             if not quiet:
                 QMessageBox.critical(None,
@@ -1097,7 +1093,7 @@
             
         # now read the file
         if line.startswith('<?xml'):
-            res = self.__readXMLTasks(fn, dtdLine.startswith("<!DOCTYPE"))
+            self.__readXMLTasks(fn, dtdLine.startswith("<!DOCTYPE"))
         else:
             QMessageBox.critical(None,
                 self.trUtf8("Read project session"),
@@ -1696,7 +1692,6 @@
             fnames, target, isSource = dlg.getData()
             if target != '':
                 for fn in fnames:
-                    ext = os.path.splitext(fn)[1]
                     targetfile = os.path.join(target, os.path.basename(fn))
                     if not Utilities.samepath(os.path.dirname(fn), target):
                         try:
@@ -1721,8 +1716,8 @@
                             QMessageBox.critical(None,
                                 self.trUtf8("Add file"),
                                 self.trUtf8("<p>The selected file <b>{0}</b> could not be"
-                                    " added to <b>{1}</b>.</p>")
-                                    .format(fn, target),
+                                    " added to <b>{1}</b>.</p><p>Reason: {2}</p>")
+                                    .format(fn, target, str(why)),
                                 QMessageBox.StandardButtons(\
                                     QMessageBox.Abort))
                             return
@@ -1773,8 +1768,8 @@
                 QMessageBox.critical(None,
                     self.trUtf8("Add directory"),
                     self.trUtf8("<p>The target directory <b>{0}</b> could not be"
-                        " created.</p>")
-                        .format(target),
+                        " created.</p><p>Reason: {1}</p>")
+                        .format(target, str(why)),
                     QMessageBox.StandardButtons(\
                         QMessageBox.Abort))
                 return

--- a/Project/ProjectBaseBrowser.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Project/ProjectBaseBrowser.py	Sun Jan 31 18:31:28 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 import os
-import sys
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
@@ -20,9 +19,6 @@
 from .ProjectBrowserModel import *
 from .ProjectBrowserSortFilterProxyModel import ProjectBrowserSortFilterProxyModel
 
-import UI.PixmapCache
-import Preferences
-
 class ProjectBaseBrowser(Browser):
     """
     Baseclass implementing common functionality for the various project browsers.
@@ -643,4 +639,4 @@
         """
         Protected method to open the configuration dialog.
         """
-        e5App().getObject("UserInterface").showPreferences("projectBrowserPage")
\ No newline at end of file
+        e5App().getObject("UserInterface").showPreferences("projectBrowserPage")

--- a/Project/ProjectBrowser.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Project/ProjectBrowser.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,9 +7,6 @@
 Module implementing the project browser part of the eric5 UI.
 """
 
-import os
-import sys
-
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
@@ -382,4 +379,4 @@
         else:
             self.vcsStatusIndicator.setColor(\
                 Preferences.getProjectBrowserColour(self.vcsStatusColorNames[state]))
-        self.vcsStatusIndicator.setToolTip(self.vcsStatusText[state])
\ No newline at end of file
+        self.vcsStatusIndicator.setToolTip(self.vcsStatusText[state])

--- a/Project/ProjectBrowserModel.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Project/ProjectBrowserModel.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing the browser model.
 """
 
-import sys
 import os
 import re
 

--- a/Project/ProjectFormsBrowser.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Project/ProjectFormsBrowser.py	Sun Jan 31 18:31:28 2010 +0000
@@ -22,7 +22,6 @@
 from .ProjectBaseBrowser import ProjectBaseBrowser
 
 from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
-import UI.PixmapCache
 
 import Preferences
 import Utilities
@@ -908,4 +907,4 @@
             "compileSelectedForms"  : None, 
             "generateDialogCode"    : None, 
             "newForm"               : None, 
-        }
\ No newline at end of file
+        }

--- a/Project/ProjectInterfacesBrowser.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Project/ProjectInterfacesBrowser.py	Sun Jan 31 18:31:28 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 import os
-import sys
 import glob
 
 from PyQt4.QtCore import *
@@ -24,7 +23,6 @@
 from UI.BrowserModel import BrowserFileItem, BrowserClassItem, BrowserMethodItem, \
     BrowserClassAttributeItem
 from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
-import UI.PixmapCache
 
 import Preferences
 import Utilities
@@ -581,4 +579,4 @@
         """
         Private method to open the configuration dialog.
         """
-        e5App().getObject("UserInterface").showPreferences("corbaPage")
\ No newline at end of file
+        e5App().getObject("UserInterface").showPreferences("corbaPage")

--- a/Project/ProjectOthersBrowser.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Project/ProjectOthersBrowser.py	Sun Jan 31 18:31:28 2010 +0000
@@ -9,7 +9,6 @@
 """
 
 import os
-import sys
 import mimetypes
 
 from PyQt4.QtCore import *
@@ -20,12 +19,7 @@
     ProjectBrowserOthersType
 from .ProjectBaseBrowser import ProjectBaseBrowser
 
-from UI.BrowserModel import BrowserClassItem, BrowserMethodItem, \
-    BrowserDirectoryItem, BrowserFileItem
 from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
-import UI.PixmapCache
-
-import Preferences
 
 class ProjectOthersBrowser(ProjectBaseBrowser):
     """

--- a/Project/ProjectResourcesBrowser.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Project/ProjectResourcesBrowser.py	Sun Jan 31 18:31:28 2010 +0000
@@ -8,8 +8,6 @@
 """
 
 import os
-import sys
-import shutil
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
@@ -22,13 +20,10 @@
 from .ProjectBaseBrowser import ProjectBaseBrowser
 
 from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
-import UI.PixmapCache
 
 import Preferences
 import Utilities
 
-from eric5config import getConfig
-
 class ProjectResourcesBrowser(ProjectBaseBrowser):
     """
     A class used to display the resources part of the project. 
@@ -815,4 +810,4 @@
             "compileChangedResources"   : None, 
             "compileSelectedResources"  : None, 
             "newResource"               : None, 
-        }
\ No newline at end of file
+        }

--- a/Project/ProjectSourcesBrowser.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Project/ProjectSourcesBrowser.py	Sun Jan 31 18:31:28 2010 +0000
@@ -8,17 +8,13 @@
 """
 
 import os
-import sys
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from E5Gui.E5Application import e5App
-
 from UI.BrowserModel import BrowserFileItem, BrowserClassItem, BrowserMethodItem, \
     BrowserClassAttributeItem
 from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
-import UI.PixmapCache
 
 from DataViews.CodeMetricsDialog import CodeMetricsDialog
 from DataViews.PyCoverageDialog import PyCoverageDialog
@@ -884,4 +880,4 @@
             QMessageBox.Yes)
         self.applicationDiagram = ApplicationDiagram(self.project, self, 
             noModules = (res != QMessageBox.Yes))
-        self.applicationDiagram.show()
\ No newline at end of file
+        self.applicationDiagram.show()

--- a/Project/ProjectTranslationsBrowser.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Project/ProjectTranslationsBrowser.py	Sun Jan 31 18:31:28 2010 +0000
@@ -8,22 +8,18 @@
 """
 
 import os
-import sys
 import shutil
 import fnmatch
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from E5Gui.E5Application import e5App
-
 from .ProjectBrowserModel import ProjectBrowserFileItem, \
     ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \
     ProjectBrowserTranslationType
 from .ProjectBaseBrowser import ProjectBaseBrowser
 
 from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
-import UI.PixmapCache
 
 import Preferences
 import Utilities
@@ -1106,4 +1102,4 @@
             "generateSelectedWithObsolete"  : None, 
             "releaseAll"                    : None, 
             "releaseSelected"               : None, 
-        }
\ No newline at end of file
+        }

--- a/QScintilla/APIsManager.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/APIsManager.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,14 +7,11 @@
 Module implementing the APIsManager.
 """
 
-import os
-
 from PyQt4.QtCore import *
-from PyQt4.Qsci import QsciAPIs, QsciLexer
+from PyQt4.Qsci import QsciAPIs
 
 from . import Lexers
 import Preferences
-import Utilities
 
 class APIs(QObject):
     """
@@ -90,7 +87,7 @@
         """
         Private method called to save an API, after it has been prepared.
         """
-        res = self.__apis.savePrepared()
+        self.__apis.savePrepared()
         self.__inPreparation = False
         self.emit(SIGNAL('apiPreparationFinished()'))
     

--- a/QScintilla/Editor.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/Editor.py	Sun Jan 31 18:31:28 2010 +0000
@@ -9,7 +9,6 @@
 
 import os
 import re
-import types
     
 from PyQt4.Qsci import QsciScintilla, QsciMacro
 from PyQt4.QtCore import *
@@ -1350,9 +1349,9 @@
         # now set the lexer properties
         self.lexer_.initProperties()
         
-        # initialize the auto indent style of the lexer
-        ais = self.lexer_.autoIndentStyle()
-        
+##        # initialize the auto indent style of the lexer
+##        ais = self.lexer_.autoIndentStyle()
+##        
         # initialize the lexer APIs settings
         api = self.vm.getAPIsManager().getAPIs(self.apiLanguage)
         if api is not None:
@@ -3093,9 +3092,9 @@
         if self.lexer_ is not None:
             self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
             self.lexer_.initProperties()
-            
-            # initialize the auto indent style of the lexer
-            ais = self.lexer_.autoIndentStyle()
+##            
+##            # initialize the auto indent style of the lexer
+##            ais = self.lexer_.autoIndentStyle()
         
         # read the typing completer settings
         if self.completer is not None:
@@ -4737,7 +4736,6 @@
         @param ev key event (QKeyEvent)
         """
         txt = ev.text()
-        key = ev.key()
         
         # See it is text to insert.
         if len(txt) and txt >= " ":

--- a/QScintilla/Lexers/Lexer.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/Lexers/Lexer.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,8 +7,6 @@
 Module implementing the lexer base class.
 """
 
-import Preferences
-
 class Lexer(object):
     """ 
     Class to implement the lexer mixin class.

--- a/QScintilla/Lexers/LexerFortran.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/Lexers/LexerFortran.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,7 @@
 Module implementing a Fortran lexer with some additional methods.
 """
 
-from PyQt4.Qsci import QsciLexerFortran, QsciScintilla
+from PyQt4.Qsci import QsciLexerFortran
 
 from .Lexer import Lexer
 import Preferences

--- a/QScintilla/Lexers/LexerFortran77.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/Lexers/LexerFortran77.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,7 @@
 Module implementing a Fortran lexer with some additional methods.
 """
 
-from PyQt4.Qsci import QsciLexerFortran77, QsciScintilla
+from PyQt4.Qsci import QsciLexerFortran77
 
 from .Lexer import Lexer
 import Preferences

--- a/QScintilla/Lexers/LexerPascal.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/Lexers/LexerPascal.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,7 @@
 Module implementing a Pascal lexer with some additional methods.
 """
 
-from PyQt4.Qsci import QsciLexerPascal, QsciScintilla
+from PyQt4.Qsci import QsciLexerPascal
 
 from .Lexer import Lexer
 import Preferences

--- a/QScintilla/Lexers/LexerPygments.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/Lexers/LexerPygments.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,8 +7,6 @@
 Module implementing a custom lexer using pygments.
 """
 
-import sys
-
 from pygments.token import Token
 from pygments.lexers import guess_lexer_for_filename, guess_lexer, find_lexer_class
 from pygments.util import ClassNotFound

--- a/QScintilla/Lexers/LexerYAML.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/Lexers/LexerYAML.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,7 @@
 Module implementing a YAML lexer with some additional methods.
 """
 
-from PyQt4.Qsci import QsciLexerYAML, QsciScintilla
+from PyQt4.Qsci import QsciLexerYAML
 
 from .Lexer import Lexer
 import Preferences

--- a/QScintilla/Lexers/__init__.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/Lexers/__init__.py	Sun Jan 31 18:31:28 2010 +0000
@@ -8,9 +8,6 @@
 """
 
 from PyQt4.QtGui import QApplication
-from PyQt4.Qsci import QSCINTILLA_VERSION_STR
-
-from QScintilla.QsciScintillaCompat import QSCINTILLA_VERSION
 
 import Preferences
 
@@ -43,6 +40,7 @@
         wildcard patterns to be associated with the lexer)
     @exception KeyError raised when the given name is already in use
     """
+    global LexerRegistry
     if name in LexerRegistry:
         raise KeyError('Lexer "%s" already registered.' % name)
     else:

--- a/QScintilla/MiniEditor.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/MiniEditor.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing a minimalistic editor for simple editing tasks.
 """
 
-import sys
 import os
 import re
 
@@ -15,11 +14,10 @@
 from PyQt4.QtGui import *
 from PyQt4.Qsci import QsciScintilla
 
-from E5Gui.E5Application import e5App
 from E5Gui.E5Action import E5Action, createActionGroup
 
 from . import Lexers
-from .QsciScintillaCompat import QsciScintillaCompat, QSCINTILLA_VERSION
+from .QsciScintillaCompat import QsciScintillaCompat
 from .SearchReplaceWidget import SearchReplaceWidget
 
 import UI.PixmapCache
@@ -2077,9 +2075,9 @@
         
         # now set the lexer properties
         self.lexer_.initProperties()
-        
-        # initialize the auto indent style of the lexer
-        ais = self.lexer_.autoIndentStyle()
+##        
+##        # initialize the auto indent style of the lexer
+##        ais = self.lexer_.autoIndentStyle()
         
     def __styleNeeded(self, position):
         """
@@ -2297,4 +2295,4 @@
         fileEol = self.__textEdit.detectEolString(txt)
         self.__textEdit.setEolModeByEolString(fileEol)
         
-        self.__textEdit.setModified(False)
\ No newline at end of file
+        self.__textEdit.setModified(False)

--- a/QScintilla/Printer.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/Printer.py	Sun Jan 31 18:31:28 2010 +0000
@@ -9,7 +9,7 @@
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
-from PyQt4.Qsci import QsciScintilla, QsciPrinter
+from PyQt4.Qsci import QsciPrinter
 
 import Preferences
 

--- a/QScintilla/QsciScintillaCompat.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/QsciScintillaCompat.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,9 +7,6 @@
 Module implementing a compatability interface class to QsciScintilla.
 """
 
-import sys
-
-from PyQt4.QtCore import Qt, SIGNAL
 from PyQt4.QtGui import QApplication, QPalette
 from PyQt4.Qsci import QsciScintilla, \
     QSCINTILLA_VERSION as QsciQSCINTILLA_VERSION, QSCINTILLA_VERSION_STR

--- a/QScintilla/SearchReplaceWidget.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/SearchReplaceWidget.py	Sun Jan 31 18:31:28 2010 +0000
@@ -13,8 +13,6 @@
 from .Ui_SearchWidget import Ui_SearchWidget
 from .Ui_ReplaceWidget import Ui_ReplaceWidget
 
-from E5Gui.E5Action import E5Action
-
 import Preferences
 
 import UI.PixmapCache
@@ -588,4 +586,4 @@
             if aw:
                 aw.setFocus(Qt.ActiveWindowFocusReason)
             event.accept()
-            self.close()
\ No newline at end of file
+            self.close()

--- a/QScintilla/Shell.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/Shell.py	Sun Jan 31 18:31:28 2010 +0000
@@ -17,12 +17,12 @@
 from E5Gui.E5Application import e5App
 
 from . import Lexers
-from .QsciScintillaCompat import QsciScintillaCompat, QSCINTILLA_VERSION
+from .QsciScintillaCompat import QsciScintillaCompat
 
 import Preferences
 import UI.PixmapCache
 
-from Debugger.DebugClientCapabilities import HasShell, HasCompleter
+from Debugger.DebugClientCapabilities import HasCompleter
 
 from .ShellHistoryDialog import ShellHistoryDialog
 
@@ -735,7 +735,6 @@
         @param ev key event (QKeyEvent)
         """
         txt = ev.text()
-        key = ev.key()
         
         # See it is text to insert.
         if len(txt) and txt >= " ":
@@ -1429,4 +1428,4 @@
         """
         Private method to open the configuration dialog.
         """
-        e5App().getObject("UserInterface").showPreferences("shellPage")
\ No newline at end of file
+        e5App().getObject("UserInterface").showPreferences("shellPage")

--- a/QScintilla/SpellChecker.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/SpellChecker.py	Sun Jan 31 18:31:28 2010 +0000
@@ -449,11 +449,6 @@
     
     def __next__(self):
         """
-        Private method to advance to the next error.
-        """
-    
-    def __next__(self):
-        """
         Public method to advance to the next error.
         
         @return self

--- a/QScintilla/Terminal.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/Terminal.py	Sun Jan 31 18:31:28 2010 +0000
@@ -18,7 +18,7 @@
 from E5Gui.E5Application import e5App
 
 from . import Lexers
-from .QsciScintillaCompat import QsciScintillaCompat, QSCINTILLA_VERSION
+from .QsciScintillaCompat import QsciScintillaCompat
 
 import Preferences
 import Utilities
@@ -498,7 +498,6 @@
         @param ev key event (QKeyEvent)
         """
         txt = ev.text()
-        key = ev.key()
         
         # See it is text to insert.
         if len(txt) and txt >= " ":
@@ -853,7 +852,7 @@
         Private slot to stop the shell process.
         """
         self.__process.kill()
-        res = self.__process.waitForFinished(3000)
+        self.__process.waitForFinished(3000)
         
     def handlePreferencesChanged(self):
         """
@@ -927,4 +926,4 @@
         """
         Private method to open the configuration dialog.
         """
-        e5App().getObject("UserInterface").showPreferences("terminalPage")
\ No newline at end of file
+        e5App().getObject("UserInterface").showPreferences("terminalPage")

--- a/QScintilla/TypingCompleters/CompleterPython.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/TypingCompleters/CompleterPython.py	Sun Jan 31 18:31:28 2010 +0000
@@ -9,7 +9,7 @@
 
 import re
 
-from PyQt4.QtCore import QObject, SIGNAL, QRegExp
+from PyQt4.QtCore import QRegExp
 from PyQt4.Qsci import QsciLexerPython
 
 from .CompleterBase import CompleterBase

--- a/QScintilla/TypingCompleters/CompleterRuby.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/QScintilla/TypingCompleters/CompleterRuby.py	Sun Jan 31 18:31:28 2010 +0000
@@ -9,7 +9,7 @@
 
 import re
 
-from PyQt4.QtCore import QObject, SIGNAL, QRegExp
+from PyQt4.QtCore import QRegExp
 from PyQt4.Qsci import QsciLexerRuby
 
 from .CompleterBase import CompleterBase

--- a/Tasks/TaskViewer.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Tasks/TaskViewer.py	Sun Jan 31 18:31:28 2010 +0000
@@ -12,7 +12,6 @@
 """
 
 import os
-import sys
 import time
 
 from PyQt4.QtCore import *
@@ -811,4 +810,4 @@
         """
         Private method to open the configuration dialog.
         """
-        e5App().getObject("UserInterface").showPreferences("tasksPage")
\ No newline at end of file
+        e5App().getObject("UserInterface").showPreferences("tasksPage")

--- a/Templates/TemplateViewer.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Templates/TemplateViewer.py	Sun Jan 31 18:31:28 2010 +0000
@@ -9,7 +9,6 @@
 
 import datetime
 import os
-import sys
 import re
 import io
 
@@ -33,8 +32,6 @@
 import UI.PixmapCache
 import Utilities
 
-from E5Gui.E5Application import e5App
-
 class TemplateGroup(QTreeWidgetItem):
     """
     Class implementing a template group.
@@ -902,4 +899,4 @@
         names = []
         for group in list(self.groups.values()):
             names.extend(group.getEntryNames(start))
-        return sorted(names)
\ No newline at end of file
+        return sorted(names)

--- a/Tools/TRPreviewer.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Tools/TRPreviewer.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing the TR Previewer main window.
 """
 
-import sys
 import os
 
 from PyQt4.QtCore import *
@@ -16,7 +15,6 @@
 
 from .TRSingleApplication import TRSingleApplicationServer
 
-import Preferences
 import UI.PixmapCache
 import UI.Config
 

--- a/Tools/UIPreviewer.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Tools/UIPreviewer.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,8 +7,6 @@
 Module implementing the UI Previewer main window.
 """
 
-import sys
-
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from PyQt4 import uic

--- a/UI/Browser.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/UI/Browser.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing a browser with class browsing capabilities.
 """
 
-import sys
 import os
 import mimetypes
 
@@ -546,4 +545,4 @@
         if self.__embeddedBrowser == 1:
             e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage")
         elif self.__embeddedBrowser == 2:
-            e5App().getObject("UserInterface").showPreferences("projectBrowserPage")
\ No newline at end of file
+            e5App().getObject("UserInterface").showPreferences("projectBrowserPage")

--- a/UI/CompareDialog.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/UI/CompareDialog.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,8 +7,6 @@
 Module implementing a dialog to compare two files and show the result side by side.
 """
 
-import os
-import sys
 import re
 from difflib import _mdiff, IS_CHARACTER_JUNK
 
@@ -459,4 +457,4 @@
             QApplication.exit()
             return True
         
-        return False
\ No newline at end of file
+        return False

--- a/UI/DiffDialog.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/UI/DiffDialog.py	Sun Jan 31 18:31:28 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 import os
-import sys
 import time
 
 from PyQt4.QtCore import *
@@ -513,4 +512,4 @@
             QApplication.exit()
             return True
         
-        return False
\ No newline at end of file
+        return False

--- a/UI/EmailDialog.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/UI/EmailDialog.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,7 +7,6 @@
 Module implementing a dialog to send bug reports.
 """
 
-import sys
 import os
 import mimetypes
 import smtplib
@@ -18,7 +17,7 @@
 
 from .Ui_EmailDialog import Ui_EmailDialog
 
-from .Info import Program, Version, BugAddress, FeatureAddress
+from .Info import BugAddress, FeatureAddress
 import Preferences
 import Utilities
 
@@ -163,12 +162,6 @@
         
         @return string containing the mail message
         """
-        try:
-            import sipconfig
-            sip_version_str = sipconfig.Configuration().sip_version_str
-        except ImportError:
-            sip_version_str = "sip version not available"
-        
         msgtext = "%s\r\n----\r\n%s----\r\n%s----\r\n%s" % \
             (self.message.toPlainText(), 
              Utilities.generateVersionInfo("\r\n"), 
@@ -189,12 +182,6 @@
         
         @return string containing the mail message
         """
-        try:
-            import sipconfig
-            sip_version_str = sipconfig.Configuration().sip_version_str
-        except ImportError:
-            sip_version_str = "sip version not available"
-        
         mpPreamble = ("This is a MIME-encoded message with attachments. "
             "If you see this message, your mail client is not "
             "capable of displaying the attachments.")
@@ -236,7 +223,7 @@
                 att = MIMEBase(maintype, subtype)
                 att.set_payload(open(fname, 'rb').read())
                 encoders.encode_base64(att)
-            att.add_header('Content-Disposition', 'attachment', filename = fname)
+            att.add_header('Content-Disposition', 'attachment', filename = name)
             msg.attach(att)
             
         return msg.as_string()
@@ -284,8 +271,7 @@
 
             QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
             QApplication.processEvents()
-            result = server.sendmail(Preferences.getUser("Email"),
-                self.__toAddress, msg)
+            server.sendmail(Preferences.getUser("Email"), self.__toAddress, msg)
             server.quit()
             QApplication.restoreOverrideCursor()
         except (smtplib.SMTPException, socket.error) as e:
@@ -326,7 +312,7 @@
         type = mimetypes.guess_type(fname)[0]
         if not type:
             type = "application/octet-stream"
-        itm = QTreeWidgetItem(self.attachments, [fname, type])
+        QTreeWidgetItem(self.attachments, [fname, type])
         self.attachments.header().resizeSections(QHeaderView.ResizeToContents)
         self.attachments.header().setStretchLastSection(True)
         

--- a/UI/FindFileDialog.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/UI/FindFileDialog.py	Sun Jan 31 18:31:28 2010 +0000
@@ -10,8 +10,6 @@
 import os
 import re
 
-import sys
-
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
@@ -597,4 +595,4 @@
             fn = itm.text(0)
         
         cb = QApplication.clipboard()
-        cb.setText(fn)
\ No newline at end of file
+        cb.setText(fn)

--- a/UI/LogView.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/UI/LogView.py	Sun Jan 31 18:31:28 2010 +0000
@@ -10,8 +10,6 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from E5Gui.E5TabWidget import E5TabWidget
-
 from E5Gui.E5Application import e5App
 
 import UI.PixmapCache
@@ -105,4 +103,4 @@
         """
         Private method to open the configuration dialog.
         """
-        e5App().getObject("UserInterface").showPreferences("interfacePage")
\ No newline at end of file
+        e5App().getObject("UserInterface").showPreferences("interfacePage")

--- a/UI/UserInterface.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/UI/UserInterface.py	Sun Jan 31 18:31:28 2010 +0000
@@ -75,7 +75,6 @@
 from E5Gui.E5SqueezeLabels import E5SqueezeLabelPath
 from E5Gui.E5ToolBox import E5VerticalToolBox, E5HorizontalToolBox
 from E5Gui.E5SideBar import E5SideBar
-from E5Gui.E5TabWidget import E5TabWidget
 
 from VCS.StatusMonitorLed import StatusMonitorLed
 
@@ -93,8 +92,6 @@
 from E5XML.XMLEntityResolver import XMLEntityResolver
 from E5XML.TasksHandler import TasksHandler
 from E5XML.TasksWriter import TasksWriter
-from E5XML.TemplatesHandler import TemplatesHandler
-from E5XML.TemplatesWriter import TemplatesWriter
 from E5XML.SessionWriter import SessionWriter
 from E5XML.SessionHandler import SessionHandler
 

--- a/Utilities/ClassBrowsers/idlclbr.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Utilities/ClassBrowsers/idlclbr.py	Sun Jan 31 18:31:28 2010 +0000
@@ -12,8 +12,6 @@
 It is based on the Python class browser found in this package.
 """
 
-import sys
-import os
 import re
 
 import Utilities
@@ -177,7 +175,8 @@
     @param path path the file should be searched in (list of strings)
     @return the resulting dictionary
     '''
-
+    global _modules
+    
     dict = {}
     dict_counts = {}
 

--- a/Utilities/ClassBrowsers/pyclbr.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Utilities/ClassBrowsers/pyclbr.py	Sun Jan 31 18:31:28 2010 +0000
@@ -14,7 +14,6 @@
 
 
 import sys
-import os
 import imp
 import re
 
@@ -204,7 +203,8 @@
     @param inpackage flag indicating a module inside a package is scanned
     @return the resulting dictionary
     '''
-
+    global _modules
+    
     dict = {}
     dict_counts = {}
 

--- a/Utilities/ClassBrowsers/rbclbr.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Utilities/ClassBrowsers/rbclbr.py	Sun Jan 31 18:31:28 2010 +0000
@@ -12,8 +12,6 @@
 It is based on the Python class browser found in this package.
 """
 
-import sys
-import os
 import re
 
 import Utilities
@@ -245,7 +243,8 @@
     @param path path the file should be searched in (list of strings)
     @return the resulting dictionary
     '''
-
+    global _modules
+    
     dict = {}
     dict_counts = {}
 

--- a/Utilities/ModuleParser.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Utilities/ModuleParser.py	Sun Jan 31 18:31:28 2010 +0000
@@ -1273,6 +1273,8 @@
     @return reference to a Module object containing the parsed
         module information (Module)
     '''
+    global _modules
+    
     if extensions is None:
         _extensions = ['.py', '.pyw', '.ptl', '.rb']
     else:

--- a/Utilities/SingleApplication.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Utilities/SingleApplication.py	Sun Jan 31 18:31:28 2010 +0000
@@ -10,8 +10,6 @@
 from PyQt4.QtCore import SIGNAL
 from PyQt4.QtNetwork import QLocalServer, QLocalSocket
 
-import Utilities
-
 class SingleApplicationServer(QLocalServer):
     """
     Class implementing the single application server base class.

--- a/Utilities/Startup.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Utilities/Startup.py	Sun Jan 31 18:31:28 2010 +0000
@@ -10,7 +10,7 @@
 import os
 import sys
 
-from PyQt4.QtCore import QTranslator, QTextCodec, QLocale, QDir, SIGNAL, SLOT, \
+from PyQt4.QtCore import QTranslator, QTextCodec, QLocale, SIGNAL, SLOT, \
     QLibraryInfo
 from PyQt4.QtGui import QApplication
 
@@ -95,7 +95,7 @@
     @param argv list of commandline parameters (list of strings)
     @param appinfo dictionary describing the application
     @return index of the '--' option (integer). This is used to tell
-        the application, that all additional option don't belong to
+        the application, that all additional options don't belong to
         the application.
     """
     ddindex = 30000     # arbitrarily large number
@@ -154,6 +154,7 @@
         be loaded (tuple of strings)
     @return the requested locale (string)
     """
+    global loaded_translators
     translations = ("qt", "eric5") + translationFiles
     loc = Preferences.getUILanguage()
     if loc is None:
@@ -197,7 +198,7 @@
     @keyparam quitOnLastWindowClosed flag indicating to quit the application,
         if the last window was closed (boolean)
     """
-    ddindex = handleArgs(argv, appinfo)
+    handleArgs(argv, appinfo)
     app = E5Application(argv)
     app.setQuitOnLastWindowClosed(quitOnLastWindowClosed)
     try:
@@ -221,4 +222,4 @@
     app.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()"))
     w.show()
     
-    return app.exec_()
\ No newline at end of file
+    return app.exec_()

--- a/Utilities/__init__.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/Utilities/__init__.py	Sun Jan 31 18:31:28 2010 +0000
@@ -30,7 +30,6 @@
 
 from UI.Info import Program, Version
 
-from eric5config import getConfig
 import Preferences
 
 configDir = None
@@ -69,7 +68,7 @@
         """
         Constructor
         """
-        self.errorMessage = QApplication.translate("CodingError", 
+        self.errorMessage = QCoreApplication.translate("CodingError", 
             "The coding '{0}' is wrong for the given text.").format(coding)
         
     def __repr__(self):
@@ -875,7 +874,6 @@
     minor = vl[1]
 
     pyVers = major + "." + minor
-    pyVersNr = int(major) * 10 + int(minor)
 
     if isWindowsPlatform():
         libDir = sys.prefix + "\\Lib"
@@ -928,9 +926,8 @@
                 return (False, None, None, None, None)
             template = quixote.ptl_compile.Template(codestring, file)
             template.compile()
-            codeobject = template.code
         else:
-            codeobject = builtins.compile(codestring, file, 'exec')
+            builtins.compile(codestring, file, 'exec')
     except SyntaxError as detail:
         import traceback, re
         lines = traceback.format_exception_only(SyntaxError, detail)

--- a/VCS/CommandOptionsDialog.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/VCS/CommandOptionsDialog.py	Sun Jan 31 18:31:28 2010 +0000
@@ -7,8 +7,6 @@
 Module implementing the VCS command options dialog.
 """
 
-import sys
-
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 

--- a/VCS/ProjectBrowserHelper.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/VCS/ProjectBrowserHelper.py	Sun Jan 31 18:31:28 2010 +0000
@@ -228,7 +228,6 @@
         It is used to add the selected
         directory tree to the VCS repository.
         """
-        items = self.browser.getSelectedItems()
         names = []
         for itm in self.browser.getSelectedItems():
             try:
@@ -370,4 +369,4 @@
         
         @param name filename or directoryname of the item to be updated (string)
         """
-        self.project.getModel().updateVCSStatus(name)
\ No newline at end of file
+        self.project.getModel().updateVCSStatus(name)

--- a/VCS/ProjectHelper.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/VCS/ProjectHelper.py	Sun Jan 31 18:31:28 2010 +0000
@@ -8,7 +8,6 @@
 """
 
 import os
-import sys
 import shutil
 import copy
 
@@ -17,13 +16,11 @@
 
 from E5Gui.E5Application import e5App
 
-import VCS
 from .CommandOptionsDialog import vcsCommandOptionsDialog
 from .RepositoryInfoDialog import VcsRepositoryInfoDialog
 
 from E5Gui.E5Action import E5Action
 
-import Utilities
 import Preferences
 
 class VcsProjectHelper(QObject):
@@ -472,4 +469,4 @@
         """
         info = self.vcs.vcsRepositoryInfos(self.project.ppath)
         dlg = VcsRepositoryInfoDialog(None, info)
-        dlg.exec_()
\ No newline at end of file
+        dlg.exec_()

--- a/VCS/StatusMonitorThread.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/VCS/StatusMonitorThread.py	Sun Jan 31 18:31:28 2010 +0000
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import QThread, QMutex, QMutexLocker, QWaitCondition, SIGNAL
+from PyQt4.QtCore import QThread, QMutex, QWaitCondition, SIGNAL
 
 class VcsStatusMonitorThread(QThread):
     """

--- a/VCS/__init__.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/VCS/__init__.py	Sun Jan 31 18:31:28 2010 +0000
@@ -14,8 +14,6 @@
 
 from E5Gui.E5Application import e5App
 
-import Preferences
-
 ######################################################################
 ## Below is the factory function to instantiate the appropriate
 ## vcs object depending on the project settings.
@@ -53,4 +51,4 @@
                             if vc is not None:
                                 break
                 break
-    return vc
\ No newline at end of file
+    return vc

--- a/ViewManager/ViewManager.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/ViewManager/ViewManager.py	Sun Jan 31 18:31:28 2010 +0000
@@ -21,7 +21,6 @@
 
 from .BookmarkedFilesDialog import BookmarkedFilesDialog
 
-from QScintilla.QsciScintillaCompat import QSCINTILLA_VERSION
 from QScintilla.Editor import Editor
 from QScintilla.GotoDialog import GotoDialog
 from QScintilla.SearchReplaceWidget import SearchReplaceWidget

--- a/eric5-compare.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-compare.py	Sun Jan 31 18:31:28 2010 +0000
@@ -13,7 +13,6 @@
 """
 
 import sys
-import os
 
 for arg in sys.argv:
     if arg.startswith("--config="):
@@ -60,4 +59,4 @@
     sys.exit(res)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/eric5-configure.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-configure.py	Sun Jan 31 18:31:28 2010 +0000
@@ -29,9 +29,6 @@
 
 from Utilities import Startup
 
-import Preferences
-
-
 def createMainWidget(argv):
     """
     Function to create the main widget.
@@ -64,4 +61,4 @@
     sys.exit(res)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/eric5-diff.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-diff.py	Sun Jan 31 18:31:28 2010 +0000
@@ -13,7 +13,6 @@
 """
 
 import sys
-import os
 
 for arg in sys.argv:
     if arg.startswith("--config="):
@@ -54,4 +53,4 @@
     sys.exit(res)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/eric5-doc.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-doc.py	Sun Jan 31 18:31:28 2010 +0000
@@ -15,7 +15,6 @@
 import glob
 import os
 import sys
-import shutil
 import fnmatch
 
 import Utilities.ModuleParser
@@ -148,7 +147,7 @@
              "qhp-virtualfolder=", "qhp-filtername=", "qhp-filterattribs=", 
              "qhp-title=", "create-qhc", 
             ])
-    except getopt.error as e:
+    except getopt.error:
         usage()
 
     excludeDirs = ["CVS", ".svn", "_svn", ".ropeproject", "_ropeproject", 

--- a/eric5-iconeditor.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-iconeditor.py	Sun Jan 31 18:31:28 2010 +0000
@@ -13,7 +13,6 @@
 """
 
 import sys
-import os
 
 for arg in sys.argv:
     if arg.startswith("--config="):
@@ -24,7 +23,6 @@
         break
 
 from Utilities import Startup
-import Utilities
 
 def createMainWidget(argv):
     """
@@ -63,4 +61,4 @@
     sys.exit(res)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/eric5-plugininstall.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-plugininstall.py	Sun Jan 31 18:31:28 2010 +0000
@@ -11,7 +11,6 @@
 """
 
 import sys
-import os
 
 for arg in sys.argv:
     if arg.startswith("--config="):
@@ -53,4 +52,4 @@
     sys.exit(res)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/eric5-pluginrepository.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-pluginrepository.py	Sun Jan 31 18:31:28 2010 +0000
@@ -11,7 +11,6 @@
 """
 
 import sys
-import os
 
 for arg in sys.argv:
     if arg.startswith("--config="):
@@ -53,4 +52,4 @@
     sys.exit(res)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/eric5-pluginuninstall.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-pluginuninstall.py	Sun Jan 31 18:31:28 2010 +0000
@@ -11,7 +11,6 @@
 """
 
 import sys
-import os
 
 for arg in sys.argv:
     if arg.startswith("--config="):
@@ -52,4 +51,4 @@
     sys.exit(res)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/eric5-qregexp.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-qregexp.py	Sun Jan 31 18:31:28 2010 +0000
@@ -13,7 +13,6 @@
 """
 
 import sys
-import os
 
 for arg in sys.argv:
     if arg.startswith("--config="):
@@ -56,4 +55,4 @@
     sys.exit(res)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/eric5-re.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-re.py	Sun Jan 31 18:31:28 2010 +0000
@@ -13,7 +13,6 @@
 """
 
 import sys
-import os
 
 for arg in sys.argv:
     if arg.startswith("--config="):
@@ -56,4 +55,4 @@
     sys.exit(res)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/eric5-sqlbrowser.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-sqlbrowser.py	Sun Jan 31 18:31:28 2010 +0000
@@ -11,8 +11,7 @@
 of the SQL browser and starts the Qt event loop.
 """
 
-import sys, os
-import os
+import sys
 
 for arg in sys.argv:
     if arg.startswith("--config="):
@@ -60,4 +59,4 @@
     sys.exit(res)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/eric5-tray.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-tray.py	Sun Jan 31 18:31:28 2010 +0000
@@ -13,7 +13,6 @@
 """
 
 import sys
-import os
 
 for arg in sys.argv:
     if arg.startswith("--config="):
@@ -55,4 +54,4 @@
     sys.exit(res)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/eric5-trpreviewer.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-trpreviewer.py	Sun Jan 31 18:31:28 2010 +0000
@@ -13,7 +13,6 @@
 """
 
 import sys
-import os
 
 for arg in sys.argv:
     if arg.startswith("--config="):
@@ -73,4 +72,4 @@
         sys.exit(res)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/eric5-uipreviewer.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-uipreviewer.py	Sun Jan 31 18:31:28 2010 +0000
@@ -13,7 +13,6 @@
 """
 
 import sys
-import os
 
 for arg in sys.argv:
     if arg.startswith("--config="):
@@ -61,4 +60,4 @@
     sys.exit(res)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/eric5-unittest.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-unittest.py	Sun Jan 31 18:31:28 2010 +0000
@@ -13,7 +13,6 @@
 """
 
 import sys
-import os
 
 for arg in sys.argv:
     if arg.startswith("--config="):
@@ -59,4 +58,4 @@
     sys.exit(res)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/eric5-webbrowser.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5-webbrowser.py	Sun Jan 31 18:31:28 2010 +0000
@@ -30,7 +30,6 @@
     sys.path.insert(2, os.path.join(os.path.dirname(__file__), "ThirdParty", "Pygments"))
 
 from Utilities import Startup
-import Utilities
 
 def createMainWidget(argv):
     """
@@ -77,4 +76,4 @@
     sys.exit(res)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/eric5.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/eric5.py	Sun Jan 31 18:31:28 2010 +0000
@@ -51,7 +51,7 @@
 
 from E5Gui.E5Application import E5Application
 
-from UI.Info import Program, Version, BugAddress
+from UI.Info import BugAddress
 from UI.SplashScreen import SplashScreen, NoneSplashScreen
 from E5Gui.E5SingleApplication import E5SingleApplicationClient
 
@@ -250,4 +250,4 @@
         raise err
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

--- a/install-i18n.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/install-i18n.py	Sun Jan 31 18:31:28 2010 +0000
@@ -100,8 +100,6 @@
 
     global platBinDir
     
-    depChecks = 1
-
     for opt, arg in optlist:
         if opt == "-h":
             usage(0)
@@ -119,4 +117,4 @@
         print("""An internal error occured.  Please report all the output of the program,
 including the following traceback, to eric5-bugs@eric-ide.python-projects.org.
 """)
-        raise
\ No newline at end of file
+        raise

--- a/install.py	Sun Jan 31 17:11:22 2010 +0000
+++ b/install.py	Sun Jan 31 18:31:28 2010 +0000
@@ -513,7 +513,7 @@
     print("Python Version: %d.%d.%d" % sys.version_info[:3])
     
     try:
-        from PyQt4.QtCore import qVersion, PYQT_VERSION
+        from PyQt4.QtCore import qVersion
     except ImportError as msg:
         print('Sorry, please install PyQt4.')
         print('Error: %s' % msg)