More merge failure cleanups

diff --git a/postgresqleu/newsevents/feeds.py b/postgresqleu/newsevents/feeds.py
index 00e24a7792775aca5196b6511630e99461b99c56..afbccc4fde9ba7c59f6b30c730eb22e717853524 100644 (file)
--- a/postgresqleu/newsevents/feeds.py
+++ b/postgresqleu/newsevents/feeds.py
@@ -1,7 +1,7 @@
 from django.contrib.syndication.views import Feed
 from django.conf import settings
 
-from models import News, Event
+from models import News
 
 import datetime
 
@@ -17,19 +17,3 @@ class LatestNews(Feed):
        def item_link(self, news):
                return "%s/news/%s" % (settings.SITEBASE, news.id)
 
-class LatestEvents(Feed):
-       title = "Events - %s" % settings.ORG_NAME
-       link = "%s/events/" % settings.SITEBASE
-       description = "The latest events from %s" % settings.ORG_NAME
-       description_template = "pieces/event_description.html"
-       
-       def items(self):
-               return Event.objects.filter(startdate__gte=datetime.datetime.today())[:10]
-               
-       def item_link(self, event):
-               return "%s/events/%s" % (settings.SITEBASE, event.id)
-
-       def item_pubdate(self, event):
-               # RSS feed needs a datetime object, not a date object
-               return datetime.datetime.fromordinal(event.startdate.toordinal())
-