Ticket #5855: patch-5855.diff

django/contrib/syndication/feeds.py

@@ -60 +60 @@
         Returns a feedgenerator.DefaultFeed object, fully populated, for
         this feed. Raises FeedDoesNotExist for invalid parameters.
         """
-        if url:
+        if hasattr(self, 'get_object'):
             try:
                 obj = self.get_object(url.split('/'))
-            except (AttributeError, ObjectDoesNotExist):
+            except (ObjectDoesNotExist):
                 raise FeedDoesNotExist
+        elif url:
+            raise FeedDoesNotExist
         else:
             obj = None