summaryrefslogtreecommitdiff
path: root/dev-python/beautifulsoup/files/bfs-4.2.0-no-lxml.patch
blob: 75ae98b1ef455cde67c09713dbffe0e0c726a3bb (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
=== modified file 'bs4/testing.py'
--- bs4/testing.py	2013-05-07 12:19:02 +0000
+++ bs4/testing.py	2013-05-20 13:19:16 +0000
@@ -464,6 +464,18 @@
         self.assertEqual(
             soup.encode("utf-8"), markup)
 
+    def test_formatter_processes_script_tag_for_xml_documents(self):
+        doc = """
+  <script type="text/javascript">
+  </script>
+"""
+        soup = BeautifulSoup(doc, "xml")
+        # lxml would have stripped this while parsing, but we can add
+        # it later.
+        soup.script.string = 'console.log("< < hey > > ");'
+        encoded = soup.encode()
+        self.assertTrue(b"&lt; &lt; hey &gt; &gt;" in encoded)
+
     def test_popping_namespaced_tag(self):
         markup = '<rss xmlns:dc="foo"><dc:creator>b</dc:creator><dc:date>2012-07-02T20:33:42Z</dc:date><dc:rights>c</dc:rights><image>d</image></rss>'
         soup = self.soup(markup)

=== modified file 'bs4/tests/test_lxml.py'
--- bs4/tests/test_lxml.py	2013-05-09 19:36:30 +0000
+++ bs4/tests/test_lxml.py	2013-05-20 13:19:16 +0000
@@ -10,6 +10,7 @@
     LXML_VERSION = lxml.etree.LXML_VERSION
 except ImportError, e:
     LXML_PRESENT = False
+    LXML_VERSION = (0,)
 
 from bs4 import (
     BeautifulSoup,
@@ -47,7 +48,7 @@
     # test if an old version of lxml is installed.
 
     @skipIf(
-        LXML_VERSION < (2,3,5,0),
+        not LXML_PRESENT or LXML_VERSION < (2,3,5,0),
         "Skipping doctype test for old version of lxml to avoid segfault.")
     def test_empty_doctype(self):
         soup = self.soup("<!DOCTYPE>")

=== modified file 'bs4/tests/test_tree.py'
--- bs4/tests/test_tree.py	2013-05-14 12:39:16 +0000
+++ bs4/tests/test_tree.py	2013-05-20 13:19:16 +0000
@@ -1344,18 +1344,6 @@
         encoded = BeautifulSoup(doc).encode()
         self.assertTrue(b"< < hey > >" in encoded)
 
-    def test_formatter_processes_script_tag_for_xml_documents(self):
-        doc = """
-  <script type="text/javascript">
-  </script>
-"""
-        soup = BeautifulSoup(doc, "xml")
-        # lxml would have stripped this while parsing, but we can add
-        # it later.
-        soup.script.string = 'console.log("< < hey > > ");'
-        encoded = soup.encode()
-        self.assertTrue(b"&lt; &lt; hey &gt; &gt;" in encoded)
-
     def test_prettify_leaves_preformatted_text_alone(self):
         soup = self.soup("<div>  foo  <pre>  \tbar\n  \n  </pre>  baz  ")
         # Everything outside the <pre> tag is reformatted, but everything