Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merged the tests and documentation from #4720 to support the changes …

…in [7295].

Thanks, Andy Gayton. Fixed #4720. Refs #5855.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7328 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 6417f5247b98d5457d5b62c313cd8e1edeaa5e63 1 parent 649cdf9
@malcolmt malcolmt authored
View
7 docs/syndication_feeds.txt
@@ -245,6 +245,13 @@ request to the URL ``/rss/beats/0613/``:
subclass of ``ObjectDoesNotExist``. Raising ``ObjectDoesNotExist`` in
``get_object()`` tells Django to produce a 404 error for that request.
+ **New in Django development version:** The ``get_object()`` method also
+ has a chance to handle the ``/rss/beats/`` url. In this case, ``bits``
+ will be an empty list. In our example, ``len(bits) != 1`` and an
+ ``ObjectDoesNotExist`` exception will be raised, so ``/rss/beats/`` will
+ generate a 404 page. But you can handle this case however you like. For
+ example you could generate a combined feed for all beats.
+
* To generate the feed's ``<title>``, ``<link>`` and ``<description>``,
Django uses the ``title()``, ``link()`` and ``description()`` methods. In
the previous example, they were simple string class attributes, but this
View
0  tests/regressiontests/syndication/__init__.py
No changes.
View
14 tests/regressiontests/syndication/tests.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+
+from django.test import TestCase
+from django.test.client import Client
+
+class SyndicationFeedTest(TestCase):
+ def test_complex_base_url(self):
+ """
+ Tests that that the base url for a complex feed doesn't raise a 500
+ exception.
+ """
+ c = Client()
+ response = c.get('/syndication/feeds/complex/')
+ self.assertEquals(response.status_code, 404)
View
18 tests/regressiontests/syndication/urls.py
@@ -0,0 +1,18 @@
+from django.conf.urls.defaults import patterns
+from django.core.exceptions import ObjectDoesNotExist
+from django.contrib.syndication import feeds
+
+
+class ComplexFeed(feeds.Feed):
+ def get_object(self, bits):
+ if len(bits) != 1:
+ raise ObjectDoesNotExist
+ return None
+
+
+urlpatterns = patterns('',
+ (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {
+ 'feed_dict': dict(
+ complex = ComplexFeed,
+ )}),
+)
View
3  tests/urls.py
@@ -19,4 +19,7 @@
(r'^middleware/', include('regressiontests.middleware.urls')),
(r'^utils/', include('regressiontests.utils.urls')),
+
+ # test urlconf for syndication tests
+ (r'^syndication/', include('regressiontests.syndication.urls')),
)
Please sign in to comment.
Something went wrong with that request. Please try again.