diff --git a/apps/rss_feeds/views.py b/apps/rss_feeds/views.py index b90f12bf2..022f4c67b 100644 --- a/apps/rss_feeds/views.py +++ b/apps/rss_feeds/views.py @@ -106,6 +106,7 @@ def feed_autocomplete(request): feeds = list(set([Feed.get_by_id(feed_id) for feed_id in feed_ids])) feeds = [feed for feed in feeds if feed and not feed.branch_from_feed] + feeds = [feed for feed in feeds if 'facebook.com/feeds/notifications.php' not in feed.feed_address] if format == 'autocomplete': feeds = [{ 'id': feed.pk, diff --git a/fabfile.py b/fabfile.py index 33febd6cb..d40ef4288 100644 --- a/fabfile.py +++ b/fabfile.py @@ -443,6 +443,7 @@ def pip(): with cd(env.NEWSBLUR_PATH): sudo('easy_install -U pip') sudo('pip install --upgrade pip') + sudo('pip install --upgrade six') # Stupid cryptography bug requires upgraded six sudo('pip install -r requirements.txt') # PIL - Only if python-imaging didn't install through apt-get, like on Mac OS X.