Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/subversion.py
Plugins/VcsPlugins/vcsPySvn/subversion.py
- changeset 3656
- 441956d8fce5
- parent 3621
- 15f23ed3f216
- child 3670
- f0cb7579c0b4
equal
deleted
inserted
replaced
| 3654:ffeb85cdc72d | 3656:441956d8fce5 |
|---|---|
| 12 import os | 12 import os |
| 13 import sys | 13 import sys |
| 14 import shutil | 14 import shutil |
| 15 import time | 15 import time |
| 16 | 16 |
| 17 from PyQt4.QtCore import Qt, QMutexLocker, pyqtSignal, QRegExp, QDateTime | 17 from PyQt5.QtCore import Qt, QMutexLocker, pyqtSignal, QRegExp, QDateTime, \ |
| 18 from PyQt4.QtGui import QLineEdit, QDialog, QInputDialog, QApplication | 18 QCoreApplication |
| 19 from PyQt5.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication | |
| 19 | 20 |
| 20 from E5Gui.E5Application import e5App | 21 from E5Gui.E5Application import e5App |
| 21 from E5Gui import E5MessageBox | 22 from E5Gui import E5MessageBox |
| 22 | 23 |
| 23 from VCS.VersionControl import VersionControl | 24 from VCS.VersionControl import VersionControl |
| 1725 if hasattr(pysvn, 'svn_api_version'): | 1726 if hasattr(pysvn, 'svn_api_version'): |
| 1726 apiVersion = "{0} {1}".format( | 1727 apiVersion = "{0} {1}".format( |
| 1727 ".".join([str(v) for v in pysvn.svn_api_version[:3]]), | 1728 ".".join([str(v) for v in pysvn.svn_api_version[:3]]), |
| 1728 pysvn.svn_api_version[3]) | 1729 pysvn.svn_api_version[3]) |
| 1729 else: | 1730 else: |
| 1730 apiVersion = QApplication.translate('subversion', "unknown") | 1731 apiVersion = QCoreApplication.translate('subversion', "unknown") |
| 1731 | 1732 |
| 1732 hmsz = time.strftime("%H:%M:%S %Z", time.localtime(entry.commit_time)) | 1733 hmsz = time.strftime("%H:%M:%S %Z", time.localtime(entry.commit_time)) |
| 1733 if sys.version_info[0] == 2: | 1734 if sys.version_info[0] == 2: |
| 1734 hmsz = hmsz.decode(sys.getfilesystemencoding()) | 1735 hmsz = hmsz.decode(sys.getfilesystemencoding()) |
| 1735 return QApplication.translate( | 1736 return QCoreApplication.translate( |
| 1736 'subversion', | 1737 'subversion', |
| 1737 """<h3>Repository information</h3>""" | 1738 """<h3>Repository information</h3>""" |
| 1738 """<table>""" | 1739 """<table>""" |
| 1739 """<tr><td><b>PySvn V.</b></td><td>{0}</td></tr>""" | 1740 """<tr><td><b>PySvn V.</b></td><td>{0}</td></tr>""" |
| 1740 """<tr><td><b>Subversion V.</b></td><td>{1}</td></tr>""" | 1741 """<tr><td><b>Subversion V.</b></td><td>{1}</td></tr>""" |
