Merged remote changes.

Mon, 26 Mar 2012 19:40:16 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 26 Mar 2012 19:40:16 +0200
changeset 1741
ecde46558a10
parent 1740
6a92ffd41de8 (diff)
parent 1737
9868a38ffbc2 (current diff)
child 1743
4f9afcd8eb9d

Merged remote changes.

--- a/QScintilla/Terminal.py	Sun Mar 25 18:55:48 2012 +0200
+++ b/QScintilla/Terminal.py	Mon Mar 26 19:40:16 2012 +0200
@@ -215,7 +215,7 @@
         @param data data to be sent to the shell process (string)
         """
         pdata = QByteArray()
-        pdata.append(data)
+        pdata.append(bytes(data, encoding="utf-8"))
         self.__process.write(pdata)
         
     def __sendCtrl(self, cmd):
--- a/UI/ErrorLogDialog.py	Sun Mar 25 18:55:48 2012 +0200
+++ b/UI/ErrorLogDialog.py	Mon Mar 26 19:40:16 2012 +0200
@@ -57,7 +57,8 @@
         """
         Private slot to delete the log file.
         """
-        os.remove(self.__logFile)
+        if os.path.exists(self.__logFile):
+            os.remove(self.__logFile)
         self.accept()
     
     @pyqtSlot()

eric ide

mercurial