Mercurial Repositories > eric / file comparison
comparison: install.py
install.py
- changeset 133
- 5b6e8eb22796
- parent 107
- 918a6be6f051
- child 146
- afeb742e7148
equal
deleted
inserted
replaced
| 132:2c870b5b485a | 133:5b6e8eb22796 |
|---|---|
| 533 | 533 |
| 534 #check version of PyQt | 534 #check version of PyQt |
| 535 from PyQt4.QtCore import PYQT_VERSION_STR | 535 from PyQt4.QtCore import PYQT_VERSION_STR |
| 536 pyqtVersion = PYQT_VERSION_STR | 536 pyqtVersion = PYQT_VERSION_STR |
| 537 # always assume, that snapshots are new enough | 537 # always assume, that snapshots are new enough |
| 538 if pyqtVersion.find("snapshot-") == -1: | 538 if "snapshot" not in pyqtVersion: |
| 539 while pyqtVersion.count('.') < 2: | 539 while pyqtVersion.count('.') < 2: |
| 540 pyqtVersion += '.0' | 540 pyqtVersion += '.0' |
| 541 (maj, min, pat) = pyqtVersion.split('.') | 541 (maj, min, pat) = pyqtVersion.split('.') |
| 542 maj = int(maj) | 542 maj = int(maj) |
| 543 min = int(min) | 543 min = int(min) |
| 550 | 550 |
| 551 #check version of QScintilla | 551 #check version of QScintilla |
| 552 from PyQt4.Qsci import QSCINTILLA_VERSION_STR | 552 from PyQt4.Qsci import QSCINTILLA_VERSION_STR |
| 553 scintillaVersion = QSCINTILLA_VERSION_STR | 553 scintillaVersion = QSCINTILLA_VERSION_STR |
| 554 # always assume, that snapshots are new enough | 554 # always assume, that snapshots are new enough |
| 555 if scintillaVersion.find("snapshot-") == -1: | 555 if "snapshot" not in scintillaVersion: |
| 556 while scintillaVersion.count('.') < 2: | 556 while scintillaVersion.count('.') < 2: |
| 557 scintillaVersion += '.0' | 557 scintillaVersion += '.0' |
| 558 (maj, min, pat) = scintillaVersion.split('.') | 558 (maj, min, pat) = scintillaVersion.split('.') |
| 559 maj = int(maj) | 559 maj = int(maj) |
| 560 min = int(min) | 560 min = int(min) |
