openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #12463
[Merge] lp:~m2j/openlp/work into lp:openlp
m2j has proposed merging lp:~m2j/openlp/work into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~m2j/openlp/work/+merge/79997
add version information for mako, migrate and uno to exceptionform
--
https://code.launchpad.net/~m2j/openlp/work/+merge/79997
Your team OpenLP Core is requested to review the proposed merge of lp:~m2j/openlp/work into lp:openlp.
=== modified file 'openlp/core/ui/exceptionform.py'
--- openlp/core/ui/exceptionform.py 2011-10-15 21:21:22 +0000
+++ openlp/core/ui/exceptionform.py 2011-10-20 20:21:25 +0000
@@ -40,6 +40,11 @@
except ImportError:
PHONON_VERSION = u'-'
try:
+ import migrate
+ MIGRATE_VERSION = migrate.__version__
+except ImportError:
+ MIGRATE_VERSION = u'-'
+try:
import chardet
CHARDET_VERSION = chardet.__version__
except ImportError:
@@ -54,6 +59,24 @@
SQLITE_VERSION = sqlite.version
except ImportError:
SQLITE_VERSION = u'-'
+try:
+ import mako
+ MAKO_VERSION = mako.__version__
+except ImportError:
+ MAKO_VERSION = u'-'
+try:
+ import uno
+ arg = uno.createUnoStruct(u'com.sun.star.beans.PropertyValue')
+ arg.Name = u'nodepath'
+ arg.Value = u'/org.openoffice.Setup/Product'
+ context = uno.getComponentContext()
+ provider = context.ServiceManager.createInstance(
+ u'com.sun.star.configuration.ConfigurationProvider')
+ node = provider.createInstanceWithArguments(
+ u'com.sun.star.configuration.ConfigurationAccess', (arg,))
+ UNO_VERSION = node.getByName(u'ooSetupVersion')
+except ImportError:
+ UNO_VERSION = u'-'
from openlp.core.lib import translate, SettingsManager
from openlp.core.lib.ui import UiStrings
@@ -89,11 +112,14 @@
u'Phonon: %s\n' % PHONON_VERSION + \
u'PyQt4: %s\n' % Qt.PYQT_VERSION_STR + \
u'SQLAlchemy: %s\n' % sqlalchemy.__version__ + \
+ u'SQLAlchemy Migrate: %s\n' % MIGRATE_VERSION + \
u'BeautifulSoup: %s\n' % BeautifulSoup.__version__ + \
u'lxml: %s\n' % etree.__version__ + \
u'Chardet: %s\n' % CHARDET_VERSION + \
u'PyEnchant: %s\n' % ENCHANT_VERSION + \
- u'PySQLite: %s\n' % SQLITE_VERSION
+ u'PySQLite: %s\n' % SQLITE_VERSION + \
+ u'Mako: %s\n' % MAKO_VERSION + \
+ u'pyUNO bridge: %s\n' % UNO_VERSION
if platform.system() == u'Linux':
if os.environ.get(u'KDE_FULL_SESSION') == u'true':
system = system + u'Desktop: KDE SC\n'
Follow ups