Merged with remote repo because I forgot to pull before implementing bug fixes. release-2.4.2

Mon, 13 Aug 2018 17:10:46 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 13 Aug 2018 17:10:46 +0200
changeset 124
535bbaa25558
parent 122
9076742ad28e (current diff)
parent 123
97e5d21bd503 (diff)
child 125
67d1c1e03fa8

Merged with remote repo because I forgot to pull before implementing bug fixes.

ChangeLog file | annotate | diff | comparison | revisions
PluginProjectPyramid.py file | annotate | diff | comparison | revisions
PluginProjectPyramid.zip file | annotate | diff | comparison | revisions
--- a/ChangeLog	Fri Jul 06 18:41:36 2018 +0200
+++ b/ChangeLog	Mon Aug 13 17:10:46 2018 +0200
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 2.4.2:
+- bug fixes
+
 Version 2.4.1:
 - updated Russian translations
 - updated Spanish translations
--- a/PluginProjectPyramid.py	Fri Jul 06 18:41:36 2018 +0200
+++ b/PluginProjectPyramid.py	Mon Aug 13 17:10:46 2018 +0200
@@ -28,7 +28,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "2.4.1"
+version = "2.4.2"
 className = "ProjectPyramidPlugin"
 packageName = "ProjectPyramid"
 shortDescription = "Project support for Pyramid projects."
Binary file PluginProjectPyramid.zip has changed
--- a/ProjectPyramid/PyramidDialog.py	Fri Jul 06 18:41:36 2018 +0200
+++ b/ProjectPyramid/PyramidDialog.py	Mon Aug 13 17:10:46 2018 +0200
@@ -23,7 +23,7 @@
 from .Ui_PyramidDialog import Ui_PyramidDialog
 
 import Preferences
-from Globals import isWindowsPlatform, isMacPlatform
+from Globals import isWindowsPlatform, isMacPlatform, strToQByteArray
 
 
 class PyramidDialog(QDialog, Ui_PyramidDialog):
@@ -278,7 +278,7 @@
             self.resultbox.insertPlainText(inputTxt)
             self.resultbox.ensureCursorVisible()
         
-        self.proc.write(inputTxt)
+        self.proc.write(strToQByteArray(inputTxt))
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()
--- a/ProjectPyramid/PyramidRoutesDialog.py	Fri Jul 06 18:41:36 2018 +0200
+++ b/ProjectPyramid/PyramidRoutesDialog.py	Mon Aug 13 17:10:46 2018 +0200
@@ -24,6 +24,7 @@
 from .Ui_PyramidRoutesDialog import Ui_PyramidRoutesDialog
 
 import Preferences
+from Globals import strToQByteArray
 
 
 class PyramidRoutesDialog(QDialog, Ui_PyramidRoutesDialog):
@@ -230,7 +231,7 @@
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         
-        self.proc.write(inputTxt)
+        self.proc.write(strToQByteArray(inputTxt))
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

eric ide

mercurial