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/pym/euscan/handlers/generic.py
+++ b/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