Disable BeautifulSoup support.

It's just too broken.

diff --git a/NEWS b/NEWS
index 85a154d1001ef9f1a80cfbf8d3a76cb7c1a3cd8c..855ae85f19a786483098483bb5d6838b7428228d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,11 @@
 - rawdog 2.13
 
+Forcibly disable BeautifulSoup support in feedparser, since it returns
+unpickleable pseudo-string objects, and it crashes when trying to parse
+twenty or so of my feeds (reported by Joseph Reagle).
+
 Make the code that cleans up feedparser's return value more thorough --
-in particular, turn subclasses of "unicode" into real unicode objects,
-which makes rawdog work with broken versions of BeautifulSoup where
-their unicode subclass isn't pickleable (reported by Joseph Reagle).
+in particular, turn subclasses of "unicode" into real unicode objects.
 
 - rawdog 2.12
 

diff --git a/rawdoglib/rawdog.py b/rawdoglib/rawdog.py
index 988aacdef404998e07e4da1e1e70d39d0628a7f7..eef5707b36f4619ec4985f013399995f71d82106 100644 (file)
--- a/rawdoglib/rawdog.py
+++ b/rawdoglib/rawdog.py
@@ -1127,6 +1127,7 @@ class Rawdog(Persistable):
 
                feedparser._FeedParserMixin.can_contain_relative_uris = ["url"]
                feedparser._FeedParserMixin.can_contain_dangerous_markup = []
+               feedparser.BeautifulSoup = None
                set_socket_timeout(config["timeout"])
 
                if feedurl is None: