Mercurial Repositories > eric / file comparison
comparison: Preferences/ProgramsDialog.py
Preferences/ProgramsDialog.py
- changeset 12
- 1d8dd9706f46
- parent 6
- 52e8c820d0dd
- child 13
- 1af94a91f439
equal
deleted
inserted
replaced
| 11:b0996e4a289e | 12:1d8dd9706f46 |
|---|---|
| 15 from PyQt4.QtGui import QApplication, QTreeWidgetItem, QHeaderView, QCursor, \ | 15 from PyQt4.QtGui import QApplication, QTreeWidgetItem, QHeaderView, QCursor, \ |
| 16 QDialog, QDialogButtonBox | 16 QDialog, QDialogButtonBox |
| 17 | 17 |
| 18 from E4Gui.E4Application import e4App | 18 from E4Gui.E4Application import e4App |
| 19 | 19 |
| 20 from Ui_ProgramsDialog import Ui_ProgramsDialog | 20 from .Ui_ProgramsDialog import Ui_ProgramsDialog |
| 21 | 21 |
| 22 import Preferences | 22 import Preferences |
| 23 import Utilities | 23 import Utilities |
| 24 | 24 |
| 25 class ProgramsDialog(QDialog, Ui_ProgramsDialog): | 25 class ProgramsDialog(QDialog, Ui_ProgramsDialog): |
| 232 proc.setProcessChannelMode(QProcess.MergedChannels) | 232 proc.setProcessChannelMode(QProcess.MergedChannels) |
| 233 proc.start(exe, [versionCommand]) | 233 proc.start(exe, [versionCommand]) |
| 234 finished = proc.waitForFinished(10000) | 234 finished = proc.waitForFinished(10000) |
| 235 if finished: | 235 if finished: |
| 236 output = \ | 236 output = \ |
| 237 unicode(proc.readAllStandardOutput(), | 237 str(proc.readAllStandardOutput(), |
| 238 Preferences.getSystem("IOEncoding"), | 238 Preferences.getSystem("IOEncoding"), |
| 239 'replace') | 239 'replace') |
| 240 if versionRe is None: | 240 if versionRe is None: |
| 241 versionRe = "^%s" % re.escape(versionStartsWith) | 241 versionRe = "^%s" % re.escape(versionStartsWith) |
| 242 versionRe = re.compile(versionRe, re.UNICODE) | 242 versionRe = re.compile(versionRe, re.UNICODE) |
