Merge branch 'master' into port-beautifulsoup-v4

Conflicts:
	src/lxml/html/soupparser.py

1 files changed, 8 insertions, 9 deletions

diff --git a/src/lxml/html/soupparser.py b/src/lxml/html/soupparser.py
index fbbc63d5..94391bfa 100644
--- a/src/lxml/html/soupparser.py
+++ b/src/lxml/html/soupparser.py
@@ -5,18 +5,15 @@ __all__ = ["fromstring", "parse", "convert_tree"]
 
 import re
 from lxml import etree, html
+
 try:
-    from BeautifulSoup import \
-         BeautifulSoup, Tag, Comment, ProcessingInstruction, NavigableString, \
-         Declaration, CData
+    from bs4 import (
+        BeautifulSoup, Tag, Comment, ProcessingInstruction, NavigableString, Declaration, CData, Doctype)
+except ImportError:
+    from BeautifulSoup import (
+        BeautifulSoup, Tag, Comment, ProcessingInstruction, NavigableString, Declaration, CData)
     class Doctype:
         pass
-except ImportError:
-    from bs4 import \
-         BeautifulSoup, Tag, Comment, ProcessingInstruction, NavigableString, \
-         Declaration, CData, Doctype
-
-
 
 def fromstring(data, beautifulsoup=None, makeelement=None, **bsargs):
     """Parse a string of HTML data into an Element tree using the
@@ -32,6 +29,7 @@ def fromstring(data, beautifulsoup=None, makeelement=None, **bsargs):
     """
     return _parse(data, beautifulsoup, makeelement, **bsargs)
 
+
 def parse(file, beautifulsoup=None, makeelement=None, **bsargs):
     """Parse a file into an ElemenTree using the BeautifulSoup parser.
 
@@ -46,6 +44,7 @@ def parse(file, beautifulsoup=None, makeelement=None, **bsargs):
     root = _parse(file, beautifulsoup, makeelement, **bsargs)
     return etree.ElementTree(root)
 
+
 def convert_tree(beautiful_soup_tree, makeelement=None):
     """Convert a BeautifulSoup tree to a list of Element trees.