← Back to branch summary

~openlp-core/openlp/trunk

« back to all changes in this revision

Viewing changes to openlp/core/ui/exceptionform.py

  • Committer: Tim Bentley
  • Author(s): Bastian Germann
  • Date: 2018-10-28 12:56:19 UTC
  • mfrom: (2838.1.2 qcollator)
  • Revision ID: tim.bentley@gmail.com-20181028125619-zv8u9lwqegax3fz6
Replace PyICU with PyQt's QCollator

Show diffs side-by-side

added added

removed removed

Lines of Context:
openlp/core/ui/exceptionform.py
53
53
except ImportError:
54
54
    MAKO_VERSION = '-'
55
55
try:
56
 
    import icu
57
 
    try:
58
 
        ICU_VERSION = icu.VERSION
59
 
    except AttributeError:
60
 
        ICU_VERSION = 'OK'
61
 
except ImportError:
62
 
    ICU_VERSION = '-'
63
 
try:
64
56
    WEBKIT_VERSION = QtWebKit.qWebKitVersion()
65
57
except AttributeError:
66
58
    WEBKIT_VERSION = '-'
119
111
        system = translate('OpenLP.ExceptionForm', 'Platform: {platform}\n').format(platform=platform.platform())
120
112
        libraries = ('Python: {python}\nQt5: {qt5}\nPyQt5: {pyqt5}\nQtWebkit: {qtwebkit}\nSQLAlchemy: {sqalchemy}\n'
121
113
                     'SQLAlchemy Migrate: {migrate}\nBeautifulSoup: {soup}\nlxml: {etree}\nChardet: {chardet}\n'
122
 
                     'PyEnchant: {enchant}\nMako: {mako}\npyICU: {icu}\npyUNO bridge: {uno}\n'
 
114
                     'PyEnchant: {enchant}\nMako: {mako}\npyUNO bridge: {uno}\n'
123
115
                     'VLC: {vlc}\n').format(python=platform.python_version(), qt5=Qt.qVersion(),
124
116
                                            pyqt5=Qt.PYQT_VERSION_STR, qtwebkit=WEBKIT_VERSION,
125
117
                                            sqalchemy=sqlalchemy.__version__, migrate=MIGRATE_VERSION,
126
118
                                            soup=bs4.__version__, etree=etree.__version__, chardet=CHARDET_VERSION,
127
 
                                            enchant=ENCHANT_VERSION, mako=MAKO_VERSION, icu=ICU_VERSION,
 
119
                                            enchant=ENCHANT_VERSION, mako=MAKO_VERSION,
128
120
                                            uno=self._pyuno_import(), vlc=VLC_VERSION)
129
121
 
130
122
        if is_linux():