Django

Code

Changeset 7295

Show
Ignore:
Timestamp:
03/18/08 10:40:27 (4 months ago)
Author:
mtredinnick
Message:

Added more robust processing to parameterised syndication feeds for the case
when all the "extra" URL bits are accidentally omitted. Patch from Niran
Babalola <niran@niran.org>. Fixed #5855.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/AUTHORS

    r7294 r7295  
    6060    David Avsajanishvili <avsd05@gmail.com> 
    6161    axiak@mit.edu 
     62    Niran Babalola <niran@niran.org> 
    6263    Morten Bagai <m@bagai.com> 
    6364    Mikaël Barbero <mikael.barbero nospam at nospam free.fr> 

  • django/trunk/django/contrib/syndication/feeds.py

    r7051 r7295  
    5656        return attr 
    5757 
     58    def get_object(self, bits): 
     59        return None 
     60 
    5861    def get_feed(self, url=None): 
    5962        """ 
    …… 
    6265        """ 
    6366        if url: 
    64             try: 
    65                 obj = self.get_object(url.split('/')) 
    66             except (AttributeError, ObjectDoesNotExist): 
    67                 raise FeedDoesNotExist 
     67            bits = url.split('/') 
    6868        else: 
    69             obj = None 
     69            bits = [] 
     70 
     71        try: 
     72            obj = self.get_object(bits) 
     73        except ObjectDoesNotExist: 
     74            raise FeedDoesNotExist 
    7075 
    7176        if Site._meta.installed: