From c15063f3c277d0d3b2d66c18583405ffe83f092b Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Wed, 11 Dec 2013 16:40:49 +0000
Subject: [PATCH] Adjust the import path for feeds  - Legacy-Id: 6879

---
 ietf/doc/feeds.py       |  2 +-
 ietf/iesg/feeds.py      | 10 ++++++----
 ietf/ipr/feeds.py       |  2 +-
 ietf/liaisons/feeds.py  |  2 +-
 ietf/meeting/feeds.py   |  2 +-
 ietf/wgcharter/feeds.py |  2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ietf/doc/feeds.py b/ietf/doc/feeds.py
index b3789a90e..ee93356b3 100644
--- a/ietf/doc/feeds.py
+++ b/ietf/doc/feeds.py
@@ -3,7 +3,7 @@
 import datetime, re
 
 from django.conf import settings
-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed
 from django.core.urlresolvers import reverse as urlreverse
 from django.template.defaultfilters import truncatewords_html, date as datefilter, linebreaks
diff --git a/ietf/iesg/feeds.py b/ietf/iesg/feeds.py
index a17441f03..d9111e579 100644
--- a/ietf/iesg/feeds.py
+++ b/ietf/iesg/feeds.py
@@ -1,11 +1,13 @@
 # Copyright The IETF Trust 2007, 2008, All Rights Reserved
 
-from django.conf import settings
-from django.contrib.syndication.feeds import Feed
-from django.utils.feedgenerator import Atom1Feed
-from ietf.doc.models import Document
 import datetime
 
+from django.conf import settings
+from django.contrib.syndication.views import Feed
+from django.utils.feedgenerator import Atom1Feed
+
+from ietf.doc.models import Document
+
 class IESGAgenda(Feed):
     title = "Documents on Future IESG Telechat Agendas"
     link = settings.IDTRACKER_BASE_URL + "/iesg/agenda/"
diff --git a/ietf/ipr/feeds.py b/ietf/ipr/feeds.py
index 3afac4b13..9bd645748 100644
--- a/ietf/ipr/feeds.py
+++ b/ietf/ipr/feeds.py
@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-from django.contrib.syndication.feeds import Feed
+from django.contrib.syndication.views import Feed
 from django.utils.feedgenerator import Atom1Feed
 from ietf.ipr.models import IprDetail
 from ietf.utils.lazy import reverse_lazy
diff --git a/ietf/liaisons/feeds.py b/ietf/liaisons/feeds.py
index 4e62bb5cb..12a562fa9 100644
--- a/ietf/liaisons/feeds.py
+++ b/ietf/liaisons/feeds.py
@@ -3,7 +3,7 @@
 import re, datetime
 
 from django.conf import settings
-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed
 from django.db.models import Q
 from django.core.urlresolvers import reverse as urlreverse
diff --git a/ietf/meeting/feeds.py b/ietf/meeting/feeds.py
index 9c093f033..915387f1e 100644
--- a/ietf/meeting/feeds.py
+++ b/ietf/meeting/feeds.py
@@ -1,6 +1,6 @@
 import re, os, datetime
 
-from django.contrib.syndication.feeds import Feed
+from django.contrib.syndication.views import Feed
 from django.utils.feedgenerator import Atom1Feed
 from django.conf import settings
 
diff --git a/ietf/wgcharter/feeds.py b/ietf/wgcharter/feeds.py
index 1dd8bbfff..8ef74b546 100644
--- a/ietf/wgcharter/feeds.py
+++ b/ietf/wgcharter/feeds.py
@@ -3,7 +3,7 @@
 import datetime, re, os
 
 from django.conf import settings
-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed
 from django.core.urlresolvers import reverse as urlreverse
 from django.utils.html import strip_tags