Update for merge with Jerry Checkpoint multi-page readability work

12 years ago · 99d5fc0a87
parent f02fe79840
commit 99d5fc0a87
3 changed files with 1 additions and 3 deletions
--- a/src/readability_lxml/readability.py
+++ b/src/readability_lxml/readability.py
@ -27,7 +27,6 @@ log = logging.getLogger()


 REGEXES = {
-<<<<<<< HEAD:src/readability_lxml/readability.py
    'unlikelyCandidatesRe': re.compile(
        ('combx|comment|community|disqus|extra|foot|header|menu|remark|rss|'
        'shoutbox|sidebar|sponsor|ad-break|agegate|pagination|pager|popup|'
--- a/src/tests/regression.py
+++ b/src/tests/regression.py
@ -17,7 +17,6 @@ import os.path
 import re
 import sys
 import unittest
-import readability.urlfetch
 import yaml

 from lxml.html import builder as B
--- a/src/tests/test_readability.py
+++ b/src/tests/test_readability.py
@ -150,7 +150,7 @@ class TestMultiPageHelpers(unittest.TestCase):
    def test_find_next_page_url(self):
        """Verify we can find a next page url in the html body"""
        html = """
-            <html><body><a href="/?page=2">2</a></body></html>
+            <html><body><a href="/?page=2">next</a></body></html>
        """
        from lxml.html import document_fromstring
        doc = document_fromstring(html)