Mercurial Repositories > eric / file comparison
comparison: eric6/QScintilla/MiniEditor.py
eric6/QScintilla/MiniEditor.py
- changeset 7836
- 2f0d208b8137
- parent 7820
- acb71bb4e901
- child 7864
- 431e6816c60c
- child 7924
- 8a96736d465e
equal
deleted
inserted
replaced
| 7835:0835ed67714b | 7836:2f0d208b8137 |
|---|---|
| 2528 if encoding: | 2528 if encoding: |
| 2529 txt, self.encoding = Utilities.readEncodedFileWithEncoding( | 2529 txt, self.encoding = Utilities.readEncodedFileWithEncoding( |
| 2530 fileName, encoding) | 2530 fileName, encoding) |
| 2531 else: | 2531 else: |
| 2532 txt, self.encoding = Utilities.readEncodedFile(fileName) | 2532 txt, self.encoding = Utilities.readEncodedFile(fileName) |
| 2533 except (UnicodeDecodeError, IOError) as why: | 2533 except (UnicodeDecodeError, OSError) as why: |
| 2534 E5MessageBox.critical( | 2534 E5MessageBox.critical( |
| 2535 self, self.tr('Open File'), | 2535 self, self.tr('Open File'), |
| 2536 self.tr('<p>The file <b>{0}</b> could not be opened.</p>' | 2536 self.tr('<p>The file <b>{0}</b> could not be opened.</p>' |
| 2537 '<p>Reason: {1}</p>') | 2537 '<p>Reason: {1}</p>') |
| 2538 .format(fileName, str(why))) | 2538 .format(fileName, str(why))) |
| 2635 editorConfigEncoding = self.__getEditorConfig( | 2635 editorConfigEncoding = self.__getEditorConfig( |
| 2636 "DefaultEncoding", nodefault=True, config=config) | 2636 "DefaultEncoding", nodefault=True, config=config) |
| 2637 self.encoding = Utilities.writeEncodedFile( | 2637 self.encoding = Utilities.writeEncodedFile( |
| 2638 fileName, txt, self.encoding, | 2638 fileName, txt, self.encoding, |
| 2639 forcedEncoding=editorConfigEncoding) | 2639 forcedEncoding=editorConfigEncoding) |
| 2640 except (IOError, Utilities.CodingError, UnicodeError) as why: | 2640 except (OSError, Utilities.CodingError, UnicodeError) as why: |
| 2641 E5MessageBox.critical( | 2641 E5MessageBox.critical( |
| 2642 self, self.tr('Save File'), | 2642 self, self.tr('Save File'), |
| 2643 self.tr('<p>The file <b>{0}</b> could not be saved.<br/>' | 2643 self.tr('<p>The file <b>{0}</b> could not be saved.<br/>' |
| 2644 'Reason: {1}</p>') | 2644 'Reason: {1}</p>') |
| 2645 .format(fileName, str(why))) | 2645 .format(fileName, str(why))) |
