Mercurial Repositories > eric / changeset
changeset
Merged remote changes.
Mon, 23 Jul 2012 19:22:43 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 23 Jul 2012 19:22:43 +0200
- changeset 1956
- ce5cd9fee192
- parent 1955
- 9e6da33c1c10 (current diff)
- parent 1954
- 5072605ad4dd (diff)
- child 1957
- 2fed7bc4ad83
Merged remote changes.
| Documentation/Help/source.qch | file | annotate | diff | comparison | revisions |
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py Mon Jul 23 19:21:44 2012 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py Mon Jul 23 19:22:43 2012 +0200 @@ -64,7 +64,7 @@ self.__fileName = HelpUtilities.ensureUniqueFilename(filePath) try: - f = open(self.__fileName, "w") + f = open(self.__fileName, "w", encoding="utf-8") except (IOError, OSError) as err: E5MessageBox.critical(None, self.trUtf8("GreaseMonkey Download"), @@ -111,7 +111,7 @@ fileName = HelpUtilities.ensureUniqueFilename(filePath, "{0}") try: - f = open(fileName, "w") + f = open(fileName, "w", encoding="utf-8") except (IOError, OSError) as err: E5MessageBox.critical(None, self.trUtf8("GreaseMonkey Download"),
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyManager.py Mon Jul 23 19:21:44 2012 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyManager.py Mon Jul 23 19:22:43 2012 +0200 @@ -112,7 +112,7 @@ if settings.contains(url): fileName = settings.value(url) try: - f = open(fileName, "r") + f = open(fileName, "r", encoding="utf-8") source = f.read() f.close() except (IOError, OSError):
