made bs4 and soupsieve standalone in this project

lib/bs4/tests/test_builder_registry.py

@@ -3,21 +3,21 @@
 import unittest
 import warnings
 
-from ...bs4 import BeautifulSoup
-from ...bs4.builder import (
+from .. import BeautifulSoup
+from ..builder import (
     builder_registry as registry,
     HTMLParserTreeBuilder,
     TreeBuilderRegistry,
 )
 
 try:
-    from ...bs4.builder import HTML5TreeBuilder
+    from ..builder import HTML5TreeBuilder
     HTML5LIB_PRESENT = True
 except ImportError:
     HTML5LIB_PRESENT = False
 
 try:
-    from ...bs4.builder import (
+    from ..builder import (
         LXMLTreeBuilderForXML,
         LXMLTreeBuilder,
         )

lib/bs4/tests/test_html5lib.py

@@ -3,12 +3,12 @@
 import warnings
 
 try:
-    from ...bs4.builder import HTML5TreeBuilder
+    from ..builder import HTML5TreeBuilder
     HTML5LIB_PRESENT = True
 except ImportError as e:
     HTML5LIB_PRESENT = False
-from ...bs4.element import SoupStrainer
-from ...bs4.testing import (
+from ..element import SoupStrainer
+from ..testing import (
     HTML5TreeBuilderSmokeTest,
     SoupTest,
     skipIf,

lib/bs4/tests/test_htmlparser.py

@@ -3,9 +3,9 @@ trees."""
 
 from pdb import set_trace
 import pickle
-from ...bs4.testing import SoupTest, HTMLTreeBuilderSmokeTest
-from ...bs4.builder import HTMLParserTreeBuilder
-from ...bs4.builder._htmlparser import BeautifulSoupHTMLParser
+from ..testing import SoupTest, HTMLTreeBuilderSmokeTest
+from ..builder import HTMLParserTreeBuilder
+from ..builder._htmlparser import BeautifulSoupHTMLParser
 
 class HTMLParserTreeBuilderSmokeTest(SoupTest, HTMLTreeBuilderSmokeTest):
 

lib/bs4/tests/test_lxml.py

@@ -12,16 +12,16 @@ except ImportError as e:
     LXML_VERSION = (0,)
 
 if LXML_PRESENT:
-    from ...bs4.builder import LXMLTreeBuilder, LXMLTreeBuilderForXML
+    from ..builder import LXMLTreeBuilder, LXMLTreeBuilderForXML
 
-from ...bs4 import (
+from .. import (
     BeautifulSoup,
     BeautifulStoneSoup,
     )
-from ...bs4.element import Comment, Doctype, SoupStrainer
-from ...bs4.testing import skipIf
-from ...bs4.tests import test_htmlparser
-from ...bs4.testing import (
+from ..element import Comment, Doctype, SoupStrainer
+from ..testing import skipIf
+from . import test_htmlparser
+from ..testing import (
     HTMLTreeBuilderSmokeTest,
     XMLTreeBuilderSmokeTest,
     SoupTest,

lib/bs4/tests/test_soup.py

@@ -7,17 +7,17 @@ import unittest
 import sys
 import tempfile
 
-from ...bs4 import (
+from .. import (
     BeautifulSoup,
     BeautifulStoneSoup,
     GuessedAtParserWarning,
     MarkupResemblesLocatorWarning,
 )
-from ...bs4.builder import (
+from ..builder import (
     TreeBuilder,
     ParserRejectedMarkup,
 )
-from ...bs4.element import (
+from ..element import (
     CharsetMetaAttributeValue,
     Comment,
     ContentMetaAttributeValue,
@@ -27,13 +27,13 @@ from ...bs4.element import (
     NavigableString,
     )
 
-from ...bs4.dammit import *
-from ...bs4.dammit import (
+from ..dammit import *
+from ..dammit import (
     EntitySubstitution,
     UnicodeDammit,
     EncodingDetector,
 )
-from ...bs4.testing import (
+from ..testing import (
     default_builder,
     SoupTest,
     skipIf,
@@ -41,7 +41,7 @@ from ...bs4.testing import (
 import warnings
 
 try:
-    from ...bs4.builder import LXMLTreeBuilder, LXMLTreeBuilderForXML
+    from ..builder import LXMLTreeBuilder, LXMLTreeBuilderForXML
     LXML_PRESENT = True
 except ImportError as e:
     LXML_PRESENT = False
@@ -120,11 +120,10 @@ class TestConstructor(SoupTest):
             def feed(self, *args, **kwargs):
                 raise ParserRejectedMarkup("Nope.")
 
-        def prepare_markup(self, *args, **kwargs):
-            # We're going to try two different ways of preparing this markup,
-            # but feed() will reject both of them.
-            yield markup, None, None, False
-            yield markup, None, None, False
+            def prepare_markup(self, markup, *args, **kwargs):
+                # We're going to try two different ways of preparing this markup,
+                # but feed() will reject both of them.
+                yield markup, None, None, False
             
         import re
         self.assertRaisesRegex(
@@ -613,7 +612,7 @@ class TestUnicodeDammit(unittest.TestCase):
         self.assertRaises(UnicodeDecodeError, doc.decode, "utf8")
 
         # Unicode, Dammit thinks the whole document is Windows-1252,
-        # and decodes it into "☃☃☃“Hi, I like Windows!”☃☃☃"
+        # and decodes it into "☃☃☃"Hi, I like Windows!"☃☃☃"
 
         # But if we run it through fix_embedded_windows_1252, it's fixed:
 

lib/bs4/tests/test_tree.py

@@ -14,12 +14,12 @@ import copy
 import pickle
 import re
 import warnings
-from ...bs4 import BeautifulSoup
-from ...bs4.builder import (
+from .. import BeautifulSoup
+from ..builder import (
     builder_registry,
     HTMLParserTreeBuilder,
 )
-from ...bs4.element import (
+from ..element import (
     PY3K,
     CData,
     Comment,
@@ -33,7 +33,7 @@ from ...bs4.element import (
     Tag,
     TemplateString,
 )
-from ...bs4.testing import (
+from ..testing import (
     SoupTest,
     skipIf,
 )