Ticket #15707: 15707.2.diff

django/contrib/gis/feeds.py

@@ -1 @@
-from django.contrib.syndication.feeds import Feed as BaseFeed, FeedDoesNotExist
+from django.contrib.syndication.views import Feed as BaseFeed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed
 
 class GeoFeedMixin(object):

django/contrib/gis/tests/geoapp/urls.py

@@ -1 +1 @@
 from django.conf.urls.defaults import *
-from feeds import feed_dict
+from feeds import TestGeoRSS1, TestGeoRSS2, TestGeoAtom1, TestGeoAtom2, \
+    TestW3CGeo1, TestW3CGeo2, TestW3CGeo3
 
 urlpatterns = patterns('',
-    (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feed_dict}),
+    (r'^feeds/rss1/$',  TestGeoRSS1()),
+    (r'^feeds/rss2/$',  TestGeoRSS2()),
+    (r'^feeds/atom1/$', TestGeoAtom1()),
+    (r'^feeds/atom2/$', TestGeoAtom2()),
+    (r'^feeds/w3cgeo1/$', TestW3CGeo1()),
+    (r'^feeds/w3cgeo2/$', TestW3CGeo2()),
+    (r'^feeds/w3cgeo3/$', TestW3CGeo3()),
 )
 
 from sitemaps import sitemaps
@@ -10 +17 @@
     (r'^sitemap.xml$', 'index', {'sitemaps' : sitemaps}),
     (r'^sitemaps/(?P<section>\w+)\.xml$', 'sitemap', {'sitemaps' : sitemaps}),
     (r'^sitemaps/kml/(?P<label>\w+)/(?P<model>\w+)/(?P<field_name>\w+)\.kml$', 'kml'),
-    (r'^sitemaps/kml/(?P<label>\w+)/(?P<model>\w+)/(?P<field_name>\w+)\.kmz$', 'kmz'),                
+    (r'^sitemaps/kml/(?P<label>\w+)/(?P<model>\w+)/(?P<field_name>\w+)\.kmz$', 'kmz'),
 )