Django

Code

Show
Ignore:
Timestamp:
03/22/08 14:20:19 (10 months ago)
Author:
jkocherhans
Message:

newforms-admin: Merged from trunk up to [7350].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7232 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7350

  • django/branches/newforms-admin/django/contrib/syndication/feeds.py

    r7121 r7351  
    44from django.utils import feedgenerator 
    55from django.utils.encoding import smart_unicode, iri_to_uri 
    6 from django.conf import settings 
     6from django.conf import settings          
     7from django.template import RequestContext 
    78 
    89def add_domain(domain, url): 
    …… 
    5657        return attr 
    5758 
     59    def get_object(self, bits): 
     60        return None 
     61 
    5862    def get_feed(self, url=None): 
    5963        """ 
    …… 
    6266        """ 
    6367        if url: 
    64             try: 
    65                 obj = self.get_object(url.split('/')) 
    66             except (AttributeError, ObjectDoesNotExist): 
    67                 raise FeedDoesNotExist 
     68            bits = url.split('/') 
    6869        else: 
    69             obj = None 
     70            bits = [] 
     71 
     72        try: 
     73            obj = self.get_object(bits) 
     74        except ObjectDoesNotExist: 
     75            raise FeedDoesNotExist 
    7076 
    7177        if Site._meta.installed: 
    …… 
    120126                author_email = author_link = None 
    121127            feed.add_item( 
    122                 title = title_tmp.render(Context({'obj': item, 'site': current_site})), 
     128                title = title_tmp.render(RequestContext(self.request, {'obj': item, 'site': current_site})), 
    123129                link = link, 
    124                 description = description_tmp.render(Context({'obj': item, 'site': current_site})), 
     130                description = description_tmp.render(RequestContext(self.request, {'obj': item, 'site': current_site})), 
    125131                unique_id = self.__get_dynamic_attr('item_guid', item, link), 
    126132                enclosure = enc,