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

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, \

pym/euscan/handlers/generic.py

@@ -2,7 +2,10 @@ import urllib2
 import re
 import StringIO
 
-from BeautifulSoup import BeautifulSoup
+try:
+    from BeautifulSoup import BeautifulSoup
+except ImportError:
+    from bs4 import BeautifulSoup
 
 import portage