Index: contrib/syndication/feeds.py
===================================================================
--- contrib/syndication/feeds.py	(revision 5492)
+++ contrib/syndication/feeds.py	(working copy)
@@ -51,18 +51,18 @@
                 return attr()
         return attr
 
-    def get_feed(self, url=None):
+    def get_object(self, bits):
+	return None
+
+    def get_feed(self, url=""):
         """
         Returns a feedgenerator.DefaultFeed object, fully populated, for
         this feed. Raises FeedDoesNotExist for invalid parameters.
         """
-        if url:
-            try:
-                obj = self.get_object(url.split('/'))
-            except (AttributeError, ObjectDoesNotExist):
-                raise FeedDoesNotExist
-        else:
-            obj = None
+	try:
+	    obj = self.get_object(url.split('/'))
+	except (AttributeError, ObjectDoesNotExist):
+	    raise FeedDoesNotExist
 
         current_site = Site.objects.get_current()
         link = self.__get_dynamic_attr('link', obj)