Hello community, here is the log from the commit of package eric checked in at Wed Dec 19 14:30:24 CET 2007. -------- --- KDE/eric/eric.changes 2007-10-01 10:01:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/eric/eric.changes 2007-12-19 08:33:06.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 19 08:32:53 CET 2007 - stbinner@suse.de + +- update to 4.0.4: several bugfixes + +------------------------------------------------------------------- Old: ---- eric4-4.0.2.tar.bz2 eric4-i18n-cs_CZ-4.0.2.tar.bz2 eric4-i18n-de-4.0.2.tar.bz2 eric4-i18n-fr-4.0.2.tar.bz2 eric4-i18n-ru-4.0.2.tar.bz2 New: ---- eric4-4.0.4.tar.bz2 eric4-i18n-cs_CZ-4.0.4.tar.bz2 eric4-i18n-de-4.0.4.tar.bz2 eric4-i18n-fr-4.0.4.tar.bz2 eric4-i18n-ru-4.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eric.spec ++++++ --- /var/tmp/diff_new_pack.Fi7258/_old 2007-12-19 14:28:34.000000000 +0100 +++ /var/tmp/diff_new_pack.Fi7258/_new 2007-12-19 14:28:34.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package eric (Version 4.0.2) +# spec file for package eric (Version 4.0.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,7 +28,7 @@ %if %suse_version > 900 Requires: python-xml %endif -Version: 4.0.2 +Version: 4.0.4 Release: 1 Source0: eric4-%version.tar.bz2 Source1: %name.desktop @@ -84,7 +84,10 @@ %dir /opt/kde3/share/mimelnk/application /opt/kde3/share/mimelnk/application/x-eric.desktop /%python_site/* + %changelog +* Wed Dec 19 2007 - stbinner@suse.de +- update to 4.0.4: several bugfixes * Mon Oct 01 2007 - stbinner@suse.de - update to 4.0.2: - bug fixes ++++++ eric4-4.0.2.tar.bz2 -> eric4-4.0.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/ChangeLog new/eric4-4.0.4/ChangeLog --- old/eric4-4.0.2/ChangeLog 2007-09-30 16:31:50.000000000 +0200 +++ new/eric4-4.0.4/ChangeLog 2007-12-15 11:55:03.000000000 +0100 @@ -1,5 +1,11 @@ ChangeLog --------- +Version 4.0.4: +- bug fixes + +Version 4.0.3: +- bug fixes + Version 4.0.2: - bug fixes - compatibility fixes for Debian diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/ChangeLog new/eric4-4.0.4/eric/ChangeLog --- old/eric4-4.0.2/eric/ChangeLog 2007-09-02 17:32:41.000000000 +0200 +++ new/eric4-4.0.4/eric/ChangeLog 2007-11-17 11:38:48.000000000 +0100 @@ -1,5 +1,11 @@ ChangeLog --------- +Version 4.0.4: +- bug fixes + +Version 4.0.3: +- bug fixes + Version 4.0.2: - bug fixes - compatibility fixes for Debian diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/DebugClients/Python/AsyncFile.py new/eric4-4.0.4/eric/DebugClients/Python/AsyncFile.py --- old/eric4-4.0.2/eric/DebugClients/Python/AsyncFile.py 2007-09-28 19:14:39.000000000 +0200 +++ new/eric4-4.0.4/eric/DebugClients/Python/AsyncFile.py 2007-10-01 19:27:01.000000000 +0200 @@ -176,8 +176,7 @@ # to the debugger relies on the two lines of the debugger command being # delivered as two separate events. Therefore we make sure we only # read a line at a time. - line = self.sock.recv(size,socket.MSG_PEEK) - line = line.decode('utf8') + line = self.sock.recv(size, socket.MSG_PEEK) eol = line.find('\n') diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/DebugClients/Python/eric4dbgstub.py new/eric4-4.0.4/eric/DebugClients/Python/eric4dbgstub.py --- old/eric4-4.0.2/eric/DebugClients/Python/eric4dbgstub.py 2007-06-03 13:03:00.000000000 +0200 +++ new/eric4-4.0.4/eric/DebugClients/Python/eric4dbgstub.py 2007-10-07 16:01:14.000000000 +0200 @@ -35,9 +35,6 @@ if kind == "standard": import DebugClient debugger = DebugClient.DebugClient() - elif kind == "noqt": - import DebugClientNoQt - debugger = DebugClientNoQt.DebugClientNoQt() elif kind == "threads": import DebugClientThreads debugger = DebugClientThreads.DebugClientThreads() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/Debugger/DebugServer.py new/eric4-4.0.4/eric/Debugger/DebugServer.py --- old/eric4-4.0.2/eric/Debugger/DebugServer.py 2007-06-03 12:59:35.000000000 +0200 +++ new/eric4-4.0.4/eric/Debugger/DebugServer.py 2007-12-01 12:14:53.000000000 +0100 @@ -491,7 +491,8 @@ It closes our socket and shuts down the debug client. (Needed on Win OS) """ - self.debuggerInterface.shutdown() + if self.debuggerInterface is not None: + self.debuggerInterface.shutdown() def remoteEnvironment(self, env): """ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/E4Graphics/E4ArrowItem.py new/eric4-4.0.4/eric/E4Graphics/E4ArrowItem.py --- old/eric4-4.0.2/eric/E4Graphics/E4ArrowItem.py 2007-06-03 12:59:36.000000000 +0200 +++ new/eric4-4.0.4/eric/E4Graphics/E4ArrowItem.py 2007-11-17 11:41:10.000000000 +0100 @@ -107,21 +107,21 @@ width = 1 # draw the line first - line = QLineF(self._origin, self._end); - painter.setPen(QPen(Qt.black, width, Qt.SolidLine, Qt.FlatCap, Qt.MiterJoin)); - painter.drawLine(line); + line = QLineF(self._origin, self._end) + painter.setPen(QPen(Qt.black, width, Qt.SolidLine, Qt.FlatCap, Qt.MiterJoin)) + painter.drawLine(line) # draw the arrow head - arrowAngle = self._type * ArrowheadAngleFactor; + arrowAngle = self._type * ArrowheadAngleFactor slope = atan2(line.dy(), line.dx()) # Calculate left arrow point - arrowSlope = slope + arrowAngle; + arrowSlope = slope + arrowAngle a1 = QPointF(self._end.x() - self._halfLength * cos(arrowSlope), self._end.y() - self._halfLength * sin(arrowSlope)) # Calculate right arrow point - arrowSlope = slope - arrowAngle; + arrowSlope = slope - arrowAngle a2 = QPointF(self._end.x() - self._halfLength * cos(arrowSlope), self._end.y() - self._halfLength * sin(arrowSlope)) @@ -133,4 +133,4 @@ polygon.append(line.p2()) polygon.append(a1) polygon.append(a2) - painter.drawPolygon(polygon); + painter.drawPolygon(polygon) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/E4Gui/E4TabWidget.py new/eric4-4.0.4/eric/E4Gui/E4TabWidget.py --- old/eric4-4.0.2/eric/E4Gui/E4TabWidget.py 2007-06-03 13:03:01.000000000 +0200 +++ new/eric4-4.0.4/eric/E4Gui/E4TabWidget.py 2007-11-27 18:38:01.000000000 +0100 @@ -35,7 +35,7 @@ """ Public slot used to show the previous tab. """ - ind = self.currentPageIndex() - 1 + ind = self.currentIndex() - 1 if ind == -1: ind = self.count() - 1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/eric4-doc.py new/eric4-4.0.4/eric/eric4-doc.py --- old/eric4-4.0.2/eric/eric4-doc.py 2007-06-03 13:03:02.000000000 +0200 +++ new/eric4-4.0.4/eric/eric4-doc.py 2007-12-15 11:52:18.000000000 +0100 @@ -207,9 +207,9 @@ try: sf = open(stylesheetFile, "rb") stylesheet = sf.read() - sf.close + sf.close() except IOError: - sys.stderr.write("The CSS stylesheet '%s' does not exist\n" % stylesheet) + sys.stderr.write("The CSS stylesheet '%s' does not exist\n" % stylesheetFile) sys.stderr.write("Disabling CSS usage.\n") stylesheet = None else: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/Graphics/ImportsDiagram.py new/eric4-4.0.4/eric/Graphics/ImportsDiagram.py --- old/eric4-4.0.2/eric/Graphics/ImportsDiagram.py 2007-06-03 12:59:08.000000000 +0200 +++ new/eric4-4.0.4/eric/Graphics/ImportsDiagram.py 2007-10-20 17:59:24.000000000 +0200 @@ -118,10 +118,17 @@ if modules.has_key(i): impLst.append(n) for i in modules[module].from_imports.keys(): - if i.startswith(self.package): + if i.startswith('.'): + dots = len(i) - len(i.lstrip('.')) + if dots == 1: + n = i[1:] + i = n + else: + n = i # don't support imports from outside + elif i.startswith(self.package): n = i[len(self.package) + 1:] else: - n = i + n = i # don't support imports from outside if modules.has_key(i): impLst.append(n) classNames = [] diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/Helpviewer/SearchDialog.py new/eric4-4.0.4/eric/Helpviewer/SearchDialog.py --- old/eric4-4.0.2/eric/Helpviewer/SearchDialog.py 2007-06-03 12:59:25.000000000 +0200 +++ new/eric4-4.0.4/eric/Helpviewer/SearchDialog.py 2007-11-17 11:41:08.000000000 +0100 @@ -94,7 +94,7 @@ if cur.hasSelection(): cur.setPosition(backwards and cur.anchor() or cur.position(), - QTextCursor.MoveAnchor); + QTextCursor.MoveAnchor) newCur = doc.find(txt, cur, findFlags) if newCur.isNull(): KQMessageBox.information(self, self.windowTitle(), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/Packagers/__init__.py new/eric4-4.0.4/eric/Packagers/__init__.py --- old/eric4-4.0.2/eric/Packagers/__init__.py 2007-06-17 14:58:08.000000000 +0200 +++ new/eric4-4.0.4/eric/Packagers/__init__.py 2007-10-12 18:23:09.000000000 +0200 @@ -16,7 +16,7 @@ import copy from PyQt4.QtCore import QObject, SIGNAL -from PyQt4.QtGui import QMenu, QDialog +from PyQt4.QtGui import QMenu, QDialog, QMessageBox from KdeQt import KQMessageBox diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/Packagers/PackagersExecDialog.py new/eric4-4.0.4/eric/Packagers/PackagersExecDialog.py --- old/eric4-4.0.2/eric/Packagers/PackagersExecDialog.py 2007-06-03 12:59:38.000000000 +0200 +++ new/eric4-4.0.4/eric/Packagers/PackagersExecDialog.py 2007-10-20 09:45:17.000000000 +0200 @@ -70,7 +70,7 @@ self.__finish) self.setWindowTitle(self.trUtf8('%1 - %2').arg(self.cmdname).arg(script)) - self.contents.insertPlainText(self.process.arguments().join(' ')) + self.contents.insertPlainText(args.join(' ')) self.contents.ensureCursorVisible() self.process.start(program, args) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/patch_modpython.py new/eric4-4.0.4/eric/patch_modpython.py --- old/eric4-4.0.2/eric/patch_modpython.py 2007-06-03 13:03:02.000000000 +0200 +++ new/eric4-4.0.4/eric/patch_modpython.py 2007-10-07 16:01:26.000000000 +0200 @@ -105,7 +105,7 @@ s.write(' Initialize the debugger and set the script name to be reported \n') s.write(' by the debugger. This is a patch for eric4.\n') s.write(' """\n') - s.write(' if not pdb.initDebugger("noqt"):\n') + s.write(' if not pdb.initDebugger("standard"):\n') s.write(' raise ImportError("Could not initialize debugger")\n') s.write(' pdb.setScriptname(name)\n') s.write("\n") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/Preferences/ShortcutDialog.py new/eric4-4.0.4/eric/Preferences/ShortcutDialog.py --- old/eric4-4.0.2/eric/Preferences/ShortcutDialog.py 2007-06-03 12:59:20.000000000 +0200 +++ new/eric4-4.0.4/eric/Preferences/ShortcutDialog.py 2007-11-17 11:42:12.000000000 +0100 @@ -125,15 +125,15 @@ @param evt the key event (QKeyEvent) """ if evt.key() == Qt.Key_Control: - return; + return if evt.key() == Qt.Key_Meta: - return; + return if evt.key() == Qt.Key_Shift: - return; + return if evt.key() == Qt.Key_Alt: - return; + return if evt.key() == Qt.Key_Menu: - return; + return if self.keyIndex == 4: self.keyIndex = 0 @@ -142,7 +142,7 @@ if evt.key() == Qt.Key_Backtab and evt.modifiers() & Qt.ShiftModifier: self.keys[self.keyIndex] = Qt.Key_Tab else: - self.keys[self.keyIndex] = evt.key(); + self.keys[self.keyIndex] = evt.key() if evt.modifiers() & Qt.ShiftModifier: self.keys[self.keyIndex] += Qt.SHIFT diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/Preferences/Shortcuts.py new/eric4-4.0.4/eric/Preferences/Shortcuts.py --- old/eric4-4.0.2/eric/Preferences/Shortcuts.py 2007-06-03 12:59:20.000000000 +0200 +++ new/eric4-4.0.4/eric/Preferences/Shortcuts.py 2007-11-17 11:38:47.000000000 +0100 @@ -229,7 +229,12 @@ .arg(fn)) return False - parser = make_parser(dtdLine.startswith("<!DOCTYPE")) + if fn.lower().endswith("kz"): + # work around for a bug in xmlproc + validating = False + else: + validating = dtdLine.startswith("<!DOCTYPE") + parser = make_parser(validating) handler = ShortcutsHandler() er = XMLEntityResolver() eh = XMLErrorHandler() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/Project/DebuggerPropertiesDialog.py new/eric4-4.0.4/eric/Project/DebuggerPropertiesDialog.py --- old/eric4-4.0.2/eric/Project/DebuggerPropertiesDialog.py 2007-06-03 13:02:57.000000000 +0200 +++ new/eric4-4.0.4/eric/Project/DebuggerPropertiesDialog.py 2007-10-07 13:47:29.000000000 +0200 @@ -169,5 +169,5 @@ self.project.debugProperties["REDIRECT"] = \ self.redirectCheckBox.isChecked() self.project.debugProperties["NOENCODING"] = \ - self.noEncodingCheckBoxs.isChecked() + self.noEncodingCheckBox.isChecked() self.project.debugPropertiesLoaded = True diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/Project/Project.py new/eric4-4.0.4/eric/Project/Project.py --- old/eric4-4.0.2/eric/Project/Project.py 2007-07-23 19:41:43.000000000 +0200 +++ new/eric4-4.0.4/eric/Project/Project.py 2007-11-17 11:38:47.000000000 +0100 @@ -496,6 +496,9 @@ @return flag indicating success """ fn = unicode(fn) + if fn.lower().endswith("e4pz") or fn.lower().endswith("e3pz"): + # work around for a bug in xmlproc + validating = False parser = make_parser(validating) handler = ProjectHandler(self) @@ -752,6 +755,9 @@ If this flag is true, no errors are reported. """ fn = unicode(fn) + if fn.lower().endswith("e4sz") or fn.lower().endswith("e3sz"): + # work around for a bug in xmlproc + validating = False parser = make_parser(validating) handler = SessionHandler(self) @@ -935,6 +941,9 @@ requested (boolean) """ fn = unicode(fn) + if fn.lower().endswith("e4tz") or fn.lower().endswith("e3tz"): + # work around for a bug in xmlproc + validating = False parser = make_parser(validating) handler = TasksHandler(1) @@ -1075,6 +1084,9 @@ If this flag is true, no errors are reported. """ fn = unicode(fn) + if fn.lower().endswith("e4dz") or fn.lower().endswith("e3dz"): + # work around for a bug in xmlproc + validating = False parser = make_parser(validating) handler = DebuggerPropertiesHandler(self) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/QScintilla/Editor.py new/eric4-4.0.4/eric/QScintilla/Editor.py --- old/eric4-4.0.2/eric/QScintilla/Editor.py 2007-06-30 10:44:55.000000000 +0200 +++ new/eric4-4.0.4/eric/QScintilla/Editor.py 2007-11-09 19:06:59.000000000 +0100 @@ -769,6 +769,10 @@ api = self.vm.getAPIsManager().getAPIs(self.apiLanguage).getQsciAPIs() if api is not None: self.lexer.setAPIs(api) + self.acAPI = True + else: + self.acAPI = False + self.emit(SIGNAL("autoCompletionAPIsAvailable"), self.acAPI) def getLexer(self): """ @@ -2421,22 +2425,18 @@ Preferences.getEditor("AutoCompletionReplaceWord")) self.setAutoCompletionShowSingle( Preferences.getEditor("AutoCompletionShowSingle")) + autoCompletionSource = Preferences.getEditor("AutoCompletionSource") + if autoCompletionSource == QsciScintilla.AcsDocument: + self.setAutoCompletionSource(QsciScintilla.AcsDocument) + elif autoCompletionSource == QsciScintilla.AcsAPIs: + self.setAutoCompletionSource(QsciScintilla.AcsAPIs) + else: + self.setAutoCompletionSource(QsciScintilla.AcsAll) if Preferences.getEditor("AutoCompletionEnabled"): - autoCompletionSource = Preferences.getEditor("AutoCompletionSource") - if autoCompletionSource == QsciScintilla.AcsDocument: - self.setAutoCompletionSource(QsciScintilla.AcsDocument) - elif autoCompletionSource == QsciScintilla.AcsAPIs: - self.setAutoCompletionSource(QsciScintilla.AcsAPIs) - else: - self.setAutoCompletionSource(QsciScintilla.AcsAll) - self.acAPI = True - self.emit(SIGNAL("autoCompletionAPIsAvailable"), self.acAPI) self.setAutoCompletionThreshold( Preferences.getEditor("AutoCompletionThreshold")) else: - self.setAutoCompletionSource(QsciScintilla.AcsNone) self.setAutoCompletionThreshold(-1) - self.acAPI = False def __setCallTips(self): """ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/Refactoring/Refactoring.py new/eric4-4.0.4/eric/Refactoring/Refactoring.py --- old/eric4-4.0.2/eric/Refactoring/Refactoring.py 2007-06-03 13:02:53.000000000 +0200 +++ new/eric4-4.0.4/eric/Refactoring/Refactoring.py 2007-12-01 13:04:01.000000000 +0100 @@ -407,7 +407,7 @@ @param line line to place cursor at (int) """ vm = e4App().getObject("ViewManager") - openFiles = vm.getOpenFilenames() + openFiles = [Utilities.normcasepath(f) for f in vm.getOpenFilenames()] self.refreshing = True for file in savedfiles: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/Tasks/TaskViewer.py new/eric4-4.0.4/eric/Tasks/TaskViewer.py --- old/eric4-4.0.2/eric/Tasks/TaskViewer.py 2007-06-03 12:59:01.000000000 +0200 +++ new/eric4-4.0.4/eric/Tasks/TaskViewer.py 2007-11-17 11:42:12.000000000 +0100 @@ -62,7 +62,7 @@ self.created = _time and _time or time.time() self._isProjectTask = isProjectTask self.isBugfixTask = isBugfixTask - self.ppath = unicode(ppath); + self.ppath = unicode(ppath) if isProjectTask: self.filename = self.filename.replace(self.ppath + os.sep, "") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/UI/Info.py new/eric4-4.0.4/eric/UI/Info.py --- old/eric4-4.0.2/eric/UI/Info.py 2007-09-30 16:31:51.000000000 +0200 +++ new/eric4-4.0.4/eric/UI/Info.py 2007-12-15 11:55:04.000000000 +0100 @@ -8,7 +8,7 @@ """ Program = 'Eric4' -Version = '4.0.2 (r1524)' +Version = '4.0.4 (r1711)' Copyright = 'Copyright (c) 2002 - 2007 Detlev Offenbach <detlev@die-offenbachs.de>' BugAddress = 'eric4-bugs@die-offenbachs.de' Homepage = "http://www.die-offenbachs.de/eric/index.html" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/UI/UserInterface.py new/eric4-4.0.4/eric/UI/UserInterface.py --- old/eric4-4.0.2/eric/UI/UserInterface.py 2007-08-15 14:36:55.000000000 +0200 +++ new/eric4-4.0.4/eric/UI/UserInterface.py 2007-10-07 13:46:58.000000000 +0200 @@ -941,6 +941,7 @@ self.pbActivateAct.connectIt(SIGNAL('triggered()'), self.__activateProjectBrowser) self.actions.append(self.pbActivateAct) + self.pbActivateAct.addTo(self) self.debugViewerAct = E4Action(self.trUtf8('Debug-Browser'), self.trUtf8('&Debug-Browser'), 0, 0, self, 'debug_viewer', True) @@ -961,6 +962,7 @@ self.debugViewerActivateAct.connectIt(SIGNAL('triggered()'), self.__activateDebugViewer) self.actions.append(self.debugViewerActivateAct) + self.debugViewerActivateAct.addTo(self) self.shellAct = E4Action(self.trUtf8('Shell'), self.trUtf8('&Shell'), 0, 0, self, 'interprter_shell', True) @@ -982,6 +984,7 @@ self.shellActivateAct.connectIt(SIGNAL('triggered()'), self.__activateShell) self.actions.append(self.shellActivateAct) + self.shellActivateAct.addTo(self) self.browserAct = E4Action(self.trUtf8('File-Browser'), self.trUtf8('File-&Browser'), 0, 0, self, 'file_browser', True) @@ -1003,6 +1006,7 @@ self.browserActivateAct.connectIt(SIGNAL('triggered()'), self.__activateBrowser) self.actions.append(self.browserActivateAct) + self.browserActivateAct.addTo(self) self.logViewerAct = E4Action(self.trUtf8('Log-Viewer'), self.trUtf8('&Log-Viewer'), 0, 0, self, 'log_viewer', True) @@ -1023,6 +1027,7 @@ self.logViewerActivateAct.connectIt(SIGNAL('triggered()'), self.__activateLogViewer) self.actions.append(self.logViewerActivateAct) + self.logViewerActivateAct.addTo(self) self.taskViewerAct = E4Action(self.trUtf8('Task-Viewer'), self.trUtf8('T&ask-Viewer'), 0, 0, self, 'task_viewer', True) @@ -1043,6 +1048,7 @@ self.taskViewerActivateAct.connectIt(SIGNAL('triggered()'), self.__activateTaskViewer) self.actions.append(self.taskViewerActivateAct) + self.taskViewerActivateAct.addTo(self) self.templateViewerAct = E4Action(self.trUtf8('Template-Viewer'), self.trUtf8('Te&mplate-Viewer'), 0, 0, self, 'template_viewer', True) @@ -1065,6 +1071,7 @@ self.templateViewerActivateAct.connectIt(SIGNAL('triggered()'), self.__activateTemplateViewer) self.actions.append(self.templateViewerActivateAct) + self.templateViewerActivateAct.addTo(self) self.whatsThisAct = E4Action(self.trUtf8('What\'s This?'), UI.PixmapCache.getIcon("whatsThis.png"), @@ -1486,6 +1493,7 @@ self.viewmanagerActivateAct.connectIt(SIGNAL('triggered()'), self.__activateViewmanager) self.actions.append(self.viewmanagerActivateAct) + self.viewmanagerActivateAct.addTo(self) self.nextTabAct = E4Action(self.trUtf8('Show next tab'), self.trUtf8('Show next tab'), @@ -1493,6 +1501,7 @@ self, 'view_next_tab') self.nextTabAct.connectIt( SIGNAL('triggered()'), self.__nextTab) self.actions.append(self.nextTabAct) + self.nextTabAct.addTo(self) self.prevTabAct = E4Action(self.trUtf8('Show previous tab'), self.trUtf8('Show previous tab'), @@ -1500,6 +1509,7 @@ self, 'view_previous_tab') self.prevTabAct.connectIt( SIGNAL('triggered()'), self.__prevTab) self.actions.append(self.prevTabAct) + self.prevTabAct.addTo(self) # initialize viewmanager actions self.viewmanager.initActions() @@ -1680,6 +1690,8 @@ self.__showToolbarsMenu) self.connect(self.toolbarsMenu, SIGNAL('triggered(QAction *)'), self.__TBMenuTriggered) + + self.__showWindowMenu() # to initialize these actions self.bookmarkMenu = self.viewmanager.initBookmarkMenu() mb.addMenu(self.bookmarkMenu) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/Utilities/__init__.py new/eric4-4.0.4/eric/Utilities/__init__.py --- old/eric4-4.0.2/eric/Utilities/__init__.py 2007-06-03 13:02:20.000000000 +0200 +++ new/eric4-4.0.4/eric/Utilities/__init__.py 2007-11-22 21:33:38.000000000 +0100 @@ -230,7 +230,10 @@ """ if not text: return "" - text = unicode(text) + try: + text = unicode(text, "utf-8") + except (ValueError, LookupError): + pass text = pattern.sub(escape_uentities, text) return text.encode("ascii") @@ -736,12 +739,15 @@ codestring = codestring + '\n' try: + if type(file) == type(u""): + file = file.encode('utf-8') + if file.endswith('.ptl'): try: import quixote.ptl_compile except ImportError: return (0, None, None, None, None) - template = quixote.ptl_compile.Template(codestring, str(file)) + template = quixote.ptl_compile.Template(codestring, file) template.compile() codeobject = template.code else: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/Utilities/ModuleParser.py new/eric4-4.0.4/eric/Utilities/ModuleParser.py --- old/eric4-4.0.2/eric/Utilities/ModuleParser.py 2007-06-03 13:02:20.000000000 +0200 +++ new/eric4-4.0.4/eric/Utilities/ModuleParser.py 2007-11-18 10:57:59.000000000 +0100 @@ -131,7 +131,7 @@ | (?P<ImportFrom> ^ from [ \t]+ (?P<ImportFromPath> - [a-zA-Z_] \w* + [a-zA-Z_.] \w* (?: [ \t]* \. [ \t]* [a-zA-Z_] \w* )* @@ -349,7 +349,7 @@ def __py_scan(self, src): """ - Privaet method to scan the source text of a Python module and retrieve the + Private method to scan the source text of a Python module and retrieve the relevant information. @param src the source text to be scanned (string) @@ -986,8 +986,10 @@ return _modules[modname] mod = Module(modname, file, type) - mod.scan(f.read()) - f.close() + try: + mod.scan(f.read()) + finally: + f.close() if caching: _modules[modname] = mod return mod diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/VCS/ProjectHelper.py new/eric4-4.0.4/eric/VCS/ProjectHelper.py --- old/eric4-4.0.2/eric/VCS/ProjectHelper.py 2007-09-30 14:02:07.000000000 +0200 +++ new/eric4-4.0.4/eric/VCS/ProjectHelper.py 2007-12-12 19:50:13.000000000 +0100 @@ -302,7 +302,7 @@ QMessageBox.Yes), QMessageBox.No) if vcores == QMessageBox.Yes: - codlg = vcsCommandOptionsDialog(self.vcs) + codlg = vcsCommandOptionsDialog(self.project.vcs) if codlg.exec_() == QDialog.Accepted: self.project.vcs.vcsSetOptions(codlg.getOptions()) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/VCS/vcsCVS/CvsOptionsDialog.ui new/eric4-4.0.4/eric/VCS/vcsCVS/CvsOptionsDialog.ui --- old/eric4-4.0.2/eric/VCS/vcsCVS/CvsOptionsDialog.ui 2007-06-03 13:00:42.000000000 +0200 +++ new/eric4-4.0.4/eric/VCS/vcsCVS/CvsOptionsDialog.ui 2007-11-18 13:41:41.000000000 +0100 @@ -21,18 +21,39 @@ <bool>true</bool> </property> <layout class="QVBoxLayout" > - <property name="margin" > + <property name="spacing" > <number>6</number> </property> - <property name="spacing" > + <property name="leftMargin" > + <number>6</number> + </property> + <property name="topMargin" > + <number>6</number> + </property> + <property name="rightMargin" > + <number>6</number> + </property> + <property name="bottomMargin" > <number>6</number> </property> <item> <layout class="QGridLayout" > - <property name="margin" > + <property name="leftMargin" > <number>0</number> </property> - <property name="spacing" > + <property name="topMargin" > + <number>0</number> + </property> + <property name="rightMargin" > + <number>0</number> + </property> + <property name="bottomMargin" > + <number>0</number> + </property> + <property name="horizontalSpacing" > + <number>6</number> + </property> + <property name="verticalSpacing" > <number>6</number> </property> <item row="3" column="1" > @@ -106,7 +127,7 @@ </widget> </item> <item row="1" column="1" > - <widget class="QLineEdit" name="archiveEdit" > + <widget class="QLineEdit" name="vcsArchiveEdit" > <property name="toolTip" > <string>Enter the name of the module in CVS.</string> </property> @@ -142,7 +163,7 @@ <string>&Module:</string> </property> <property name="buddy" > - <cstring>archiveEdit</cstring> + <cstring>vcsArchiveEdit</cstring> </property> </widget> </item> @@ -179,7 +200,7 @@ <tabstops> <tabstop>vcsDirectoryEdit</tabstop> <tabstop>vcsDirButton</tabstop> - <tabstop>archiveEdit</tabstop> + <tabstop>vcsArchiveEdit</tabstop> <tabstop>vcsVendorEdit</tabstop> <tabstop>vcsLogEdit</tabstop> <tabstop>vcsReleaseEdit</tabstop> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/VCS/vcsCVS/cvs.py new/eric4-4.0.4/eric/VCS/vcsCVS/cvs.py --- old/eric4-4.0.2/eric/VCS/vcsCVS/cvs.py 2007-06-03 13:00:42.000000000 +0200 +++ new/eric4-4.0.4/eric/VCS/vcsCVS/cvs.py 2007-11-18 15:15:14.000000000 +0100 @@ -52,9 +52,9 @@ """ VersionControl.__init__(self, parent, name) self.defaultOptions = { - 'global' : ['-f'], + 'global' : ['-f', '-z3'], 'commit' : [''], - 'checkout' : ['-z3'], + 'checkout' : [''], 'update' : ['-dP'], 'add' : [''], 'remove' : ['-f'], @@ -157,15 +157,14 @@ os.chdir(os.path.dirname(project.ppath)) cwdIsPpath = True tmpProjectDir = "%s_tmp" % project.ppath + shutil.rmtree(tmpProjectDir, True) os.rename(project.ppath, tmpProjectDir) os.makedirs(project.ppath) self.vcsCheckout(vcsDataDict, project.ppath) if cwdIsPpath: os.chdir(project.ppath) - self.vcsCommit(os.path.join(project.ppath, vcsDataDict["archive"]), - vcsDataDict["message"], True) - pfn = os.path.join(project.ppath, vcsDataDict["archive"], - os.path.basename(project.pfile)) + self.vcsCommit(project.ppath, vcsDataDict["message"], True) + pfn = project.pfile if not os.path.isfile(pfn): pfn += "z" if not os.path.isfile(pfn): @@ -178,12 +177,13 @@ cwdIsPpath = True else: cwdIsPpath = False - shutil.rmtree(project.ppath, 1) + shutil.rmtree(project.ppath, True) os.rename(tmpProjectDir, project.ppath) project.pdata["VCS"] = ['None'] project.vcs = None project.setDirty(True) project.saveProject() + project.closeProject() return shutil.rmtree(tmpProjectDir, True) project.openProject(pfn) @@ -213,14 +213,13 @@ args.append(vcsDataDict["archive"]) args.append(vcsDataDict["vendor"]) args.append(vcsDataDict["release"]) - proc.setWorkingDirectory(QDir(projectDir)) if noDialog: status = self.startSynchronizedProcess(QProcess(), "cvs", args, projectDir) else: dia = CvsDialog(self.trUtf8('Importing project into cvs repository')) - res = dia.startProcess(args) + res = dia.startProcess(args, projectDir) if res: dia.exec_() status = dia.normalExit() @@ -354,7 +353,7 @@ args.append(fname) if noDialog: - return self.startSynchronizedProcess(QProcess(), "cvs", procs, dname) + return self.startSynchronizedProcess(QProcess(), "cvs", args, dname) else: dia = CvsDialog(self.trUtf8('Commiting changes to cvs repository')) res = dia.startProcess(args, dname) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/VCS/vcsCVS/CvsStatusMonitorThread.py new/eric4-4.0.4/eric/VCS/vcsCVS/CvsStatusMonitorThread.py --- old/eric4-4.0.2/eric/VCS/vcsCVS/CvsStatusMonitorThread.py 2007-06-03 13:00:42.000000000 +0200 +++ new/eric4-4.0.4/eric/VCS/vcsCVS/CvsStatusMonitorThread.py 2007-11-17 11:38:48.000000000 +0100 @@ -89,6 +89,8 @@ self.reportedStates = states return True, self.trUtf8("CVS status checked successfully") else: + process.kill() return False, QString(process.readAllStandardError()) else: + process.kill() return False, self.trUtf8("Could not start the CVS process.") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/VCS/vcsCVS/Ui_CvsOptionsDialog.py new/eric4-4.0.4/eric/VCS/vcsCVS/Ui_CvsOptionsDialog.py --- old/eric4-4.0.2/eric/VCS/vcsCVS/Ui_CvsOptionsDialog.py 2007-06-03 13:00:42.000000000 +0200 +++ new/eric4-4.0.4/eric/VCS/vcsCVS/Ui_CvsOptionsDialog.py 2007-11-18 13:41:49.000000000 +0100 @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file '/home/detlev/Development/Python/Eric4/eric4_0/eric4/VCS/vcsCVS/CvsOptionsDialog.ui' # -# Created: Sat Feb 3 15:34:13 2007 -# by: PyQt4 UI code generator 4-snapshot-20070125 +# Created: Sun Nov 18 13:41:49 2007 +# by: PyQt4 UI code generator 4.3-snapshot-20071004 # # WARNING! All changes made in this file will be lost! @@ -16,8 +16,8 @@ CvsOptionsDialog.setSizeGripEnabled(True) self.vboxlayout = QtGui.QVBoxLayout(CvsOptionsDialog) - self.vboxlayout.setMargin(6) self.vboxlayout.setSpacing(6) + self.vboxlayout.setMargin(6) self.vboxlayout.setObjectName("vboxlayout") self.gridlayout = QtGui.QGridLayout() @@ -49,9 +49,9 @@ self.label_3.setObjectName("label_3") self.gridlayout.addWidget(self.label_3,4,0,1,1) - self.archiveEdit = QtGui.QLineEdit(CvsOptionsDialog) - self.archiveEdit.setObjectName("archiveEdit") - self.gridlayout.addWidget(self.archiveEdit,1,1,1,1) + self.vcsArchiveEdit = QtGui.QLineEdit(CvsOptionsDialog) + self.vcsArchiveEdit.setObjectName("vcsArchiveEdit") + self.gridlayout.addWidget(self.vcsArchiveEdit,1,1,1,1) self.label_2 = QtGui.QLabel(CvsOptionsDialog) self.label_2.setObjectName("label_2") @@ -79,15 +79,15 @@ self.label_3.setBuddy(self.vcsReleaseEdit) self.label_2.setBuddy(self.vcsVendorEdit) self.TextLabel5.setBuddy(self.vcsLogEdit) - self.label.setBuddy(self.archiveEdit) + self.label.setBuddy(self.vcsArchiveEdit) self.retranslateUi(CvsOptionsDialog) QtCore.QObject.connect(self.buttonBox,QtCore.SIGNAL("accepted()"),CvsOptionsDialog.accept) QtCore.QObject.connect(self.buttonBox,QtCore.SIGNAL("rejected()"),CvsOptionsDialog.reject) QtCore.QMetaObject.connectSlotsByName(CvsOptionsDialog) CvsOptionsDialog.setTabOrder(self.vcsDirectoryEdit,self.vcsDirButton) - CvsOptionsDialog.setTabOrder(self.vcsDirButton,self.archiveEdit) - CvsOptionsDialog.setTabOrder(self.archiveEdit,self.vcsVendorEdit) + CvsOptionsDialog.setTabOrder(self.vcsDirButton,self.vcsArchiveEdit) + CvsOptionsDialog.setTabOrder(self.vcsArchiveEdit,self.vcsVendorEdit) CvsOptionsDialog.setTabOrder(self.vcsVendorEdit,self.vcsLogEdit) CvsOptionsDialog.setTabOrder(self.vcsLogEdit,self.vcsReleaseEdit) @@ -112,8 +112,8 @@ self.vcsDirectoryEdit.setWhatsThis(QtGui.QApplication.translate("CvsOptionsDialog", "<b>VCS-Directory</b>\n" "<p>Enter the name of the directory, that is the root of the VCS repository to be used. You may select it by pressing the button to the right.</p>", None, QtGui.QApplication.UnicodeUTF8)) self.label_3.setText(QtGui.QApplication.translate("CvsOptionsDialog", "Release &Label:", None, QtGui.QApplication.UnicodeUTF8)) - self.archiveEdit.setToolTip(QtGui.QApplication.translate("CvsOptionsDialog", "Enter the name of the module in CVS.", None, QtGui.QApplication.UnicodeUTF8)) - self.archiveEdit.setWhatsThis(QtGui.QApplication.translate("CvsOptionsDialog", "<b>Module in CVS</b>\n" + self.vcsArchiveEdit.setToolTip(QtGui.QApplication.translate("CvsOptionsDialog", "Enter the name of the module in CVS.", None, QtGui.QApplication.UnicodeUTF8)) + self.vcsArchiveEdit.setWhatsThis(QtGui.QApplication.translate("CvsOptionsDialog", "<b>Module in CVS</b>\n" "<p>Enter the name of the module in the CVS repository.</p>", None, QtGui.QApplication.UnicodeUTF8)) self.label_2.setText(QtGui.QApplication.translate("CvsOptionsDialog", "&Vendor Label:", None, QtGui.QApplication.UnicodeUTF8)) self.TextLabel5.setText(QtGui.QApplication.translate("CvsOptionsDialog", "Log &Message:", None, QtGui.QApplication.UnicodeUTF8)) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/VCS/vcsPySvn/subversion.py new/eric4-4.0.4/eric/VCS/vcsPySvn/subversion.py --- old/eric4-4.0.2/eric/VCS/vcsPySvn/subversion.py 2007-06-03 13:00:37.000000000 +0200 +++ new/eric4-4.0.4/eric/VCS/vcsPySvn/subversion.py 2007-11-18 15:19:25.000000000 +0100 @@ -195,6 +195,7 @@ os.chdir(os.path.dirname(project.ppath)) cwdIsPpath = True tmpProjectDir = "%s_tmp" % project.ppath + shutil.rmtree(tmpProjectDir, True) os.rename(project.ppath, tmpProjectDir) os.makedirs(project.ppath) self.vcsCheckout(vcsDataDict, project.ppath) @@ -221,6 +222,7 @@ project.vcs = None project.setDirty(True) project.saveProject() + project.closeProject() return shutil.rmtree(tmpProjectDir, True) project.openProject(pfn) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/VCS/vcsSubversion/subversion.py new/eric4-4.0.4/eric/VCS/vcsSubversion/subversion.py --- old/eric4-4.0.2/eric/VCS/vcsSubversion/subversion.py 2007-06-03 13:00:48.000000000 +0200 +++ new/eric4-4.0.4/eric/VCS/vcsSubversion/subversion.py 2007-11-18 15:19:26.000000000 +0100 @@ -180,6 +180,7 @@ os.chdir(os.path.dirname(project.ppath)) cwdIsPpath = True tmpProjectDir = "%s_tmp" % project.ppath + shutil.rmtree(tmpProjectDir, True) os.rename(project.ppath, tmpProjectDir) os.makedirs(project.ppath) self.vcsCheckout(vcsDataDict, project.ppath) @@ -206,6 +207,7 @@ project.vcs = None project.setDirty(True) project.saveProject() + project.closeProject() return shutil.rmtree(tmpProjectDir, True) project.openProject(pfn) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/VCS/vcsSubversion/SvnStatusMonitorThread.py new/eric4-4.0.4/eric/VCS/vcsSubversion/SvnStatusMonitorThread.py --- old/eric4-4.0.2/eric/VCS/vcsSubversion/SvnStatusMonitorThread.py 2007-06-03 13:00:48.000000000 +0200 +++ new/eric4-4.0.4/eric/VCS/vcsSubversion/SvnStatusMonitorThread.py 2007-11-17 11:38:48.000000000 +0100 @@ -99,6 +99,8 @@ return True, \ self.trUtf8("Subversion status checked successfully (using svn)") else: + process.kill() return False, QString(process.readAllStandardError()) else: + process.kill() return False, self.trUtf8("Could not start the Subversion process.") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/eric/ViewManager/Listspace.py new/eric4-4.0.4/eric/ViewManager/Listspace.py --- old/eric4-4.0.2/eric/ViewManager/Listspace.py 2007-06-03 12:59:40.000000000 +0200 +++ new/eric4-4.0.4/eric/ViewManager/Listspace.py 2007-11-17 11:42:56.000000000 +0100 @@ -115,8 +115,8 @@ ViewManager.__init__(self, ui, dbs) self.viewlist = QListWidget(self) - policy = self.viewlist.sizePolicy(); - policy.setHorizontalPolicy(QSizePolicy.Ignored); + policy = self.viewlist.sizePolicy() + policy.setHorizontalPolicy(QSizePolicy.Ignored) self.viewlist.setSizePolicy(policy) self.addWidget(self.viewlist) self.viewlist.setContextMenuPolicy(Qt.CustomContextMenu) @@ -135,7 +135,8 @@ self.stacks.append(stack) self.currentStack = stack stack.installEventFilter(self) - self.setSizes([int(self.width() * 0.2), int(self.width() * 0.8)]) # 20% for viewlist + self.setSizes([int(self.width() * 0.2), int(self.width() * 0.8)]) + # 20% for viewlist self.__initMenu() self.contextMenuEditor = None diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eric4-4.0.2/patch_modpython.py new/eric4-4.0.4/patch_modpython.py --- old/eric4-4.0.2/patch_modpython.py 2007-09-30 16:31:50.000000000 +0200 +++ new/eric4-4.0.4/patch_modpython.py 2007-12-15 11:55:03.000000000 +0100 @@ -105,7 +105,7 @@ s.write(' Initialize the debugger and set the script name to be reported \n') s.write(' by the debugger. This is a patch for eric4.\n') s.write(' """\n') - s.write(' if not pdb.initDebugger("noqt"):\n') + s.write(' if not pdb.initDebugger("standard"):\n') s.write(' raise ImportError("Could not initialize debugger")\n') s.write(' pdb.setScriptname(name)\n') s.write("\n") ++++++ eric4-i18n-cs_CZ-4.0.2.tar.bz2 -> eric4-i18n-cs_CZ-4.0.4.tar.bz2 ++++++ ++++++ eric4-i18n-de-4.0.2.tar.bz2 -> eric4-i18n-de-4.0.4.tar.bz2 ++++++ ++++++ eric4-i18n-fr-4.0.2.tar.bz2 -> eric4-i18n-fr-4.0.4.tar.bz2 ++++++ ++++++ eric4-i18n-ru-4.0.2.tar.bz2 -> eric4-i18n-ru-4.0.4.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org