openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #20838
[Merge] lp:~googol/openlp/bs4-version-fix into lp:openlp
Andreas Preikschat has proposed merging lp:~googol/openlp/bs4-version-fix into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~googol/openlp/bs4-version-fix/+merge/171638
fixed bs4.__version__
--
https://code.launchpad.net/~googol/openlp/bs4-version-fix/+merge/171638
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/bs4-version-fix into lp:openlp.
=== modified file 'openlp/core/ui/exceptionform.py'
--- openlp/core/ui/exceptionform.py 2013-04-23 21:47:02 +0000
+++ openlp/core/ui/exceptionform.py 2013-06-26 18:56:27 +0000
@@ -34,8 +34,8 @@
import os
import platform
+import bs4
import sqlalchemy
-from bs4 import BeautifulSoup
from lxml import etree
from PyQt4 import Qt, QtCore, QtGui, QtWebKit
@@ -145,7 +145,7 @@
u'QtWebkit: %s\n' % WEBKIT_VERSION + \
u'SQLAlchemy: %s\n' % sqlalchemy.__version__ + \
u'SQLAlchemy Migrate: %s\n' % MIGRATE_VERSION + \
- u'BeautifulSoup: %s\n' % BeautifulSoup.__version__ + \
+ u'BeautifulSoup: %s\n' % bs4.__version__ + \
u'lxml: %s\n' % etree.__version__ + \
u'Chardet: %s\n' % CHARDET_VERSION + \
u'PyEnchant: %s\n' % ENCHANT_VERSION + \
=== modified file 'scripts/check_dependencies.py'
--- scripts/check_dependencies.py 2013-06-16 19:42:50 +0000
+++ scripts/check_dependencies.py 2013-06-26 18:56:27 +0000
@@ -85,6 +85,7 @@
'migrate',
'uno',
'icu',
+ 'bs4',
]
Follow ups