Merge pull request #165 from SpikeVlg/upstream

Fixed issue #160

Author: lorien

grab/document.py

@@ -16,6 +16,8 @@
 import codecs
 from datetime import datetime
 import time
+from lxml.html import HTMLParser
+from lxml.etree import XMLParser, parse, ParserError
 from selection import XpathSelector
 import six
 from six.moves.urllib.parse import urlsplit, parse_qs, urljoin
@@ -288,9 +290,6 @@ def tree(self):
             return self.build_html_tree()
 
     def _build_dom(self, content, mode):
-        from lxml.html import HTMLParser
-        from lxml.etree import XMLParser, parse
-
         assert mode in ('html', 'xml')
         if mode == 'html':
             if not hasattr(THREAD_STORAGE, 'html_parser'):
@@ -307,8 +306,6 @@ def _build_dom(self, content, mode):
 
 
     def build_html_tree(self):
-        from lxml.etree import ParserError
-
         from grab.base import GLOBAL_STATE
 
         if self._lxml_tree is None: