Merge branch 'master' of https://github.com/iksaif/euscan

2012-06-14 10:21:37 +02:00
parent 11c8422c9b 8f1668b51e
commit 6cc892717b
2 changed files with 8 additions and 2 deletions
--- a/euscanwww/djeuscan/tests/test_views.py
+++ b/euscanwww/djeuscan/tests/test_views.py
@ -1,6 +1,9 @@
 import StringIO

-from BeautifulSoup import BeautifulSoup
+try:
+    from BeautifulSoup import BeautifulSoup
+except ImportError:
+    from bs4 import BeautifulSoup

 from djeuscan.tests import SystemTestCase
 from djeuscan.tests.euscan_factory import PackageFactory, setup_maintainers, \