diff --git a/django/core/cache.py b/django/core/cache.py index caeb315f05..a479d16dc3 100644 --- a/django/core/cache.py +++ b/django/core/cache.py @@ -336,7 +336,7 @@ class _FileCache(_SimpleCache): return os.path.exists(self._key_to_file(key)) def _cull(self, filelist): - if self.cull_frequency == 0: + if self._cull_frequency == 0: doomed = filelist else: doomed = [k for (i, k) in enumerate(filelist) if i % self._cull_frequency == 0] diff --git a/django/core/rss.py b/django/core/rss.py index e75d66ab2b..7ba0c1e30c 100644 --- a/django/core/rss.py +++ b/django/core/rss.py @@ -14,7 +14,7 @@ class FeedDoesNotExist(ObjectDoesNotExist): class Feed: item_pubdate = None - enclosure_url = None + item_enclosure_url = None def item_link(self, item): try: @@ -67,12 +67,12 @@ class Feed: for item in self.__get_dynamic_attr('items', obj): link = add_domain(current_site.domain, self.__get_dynamic_attr('item_link', item)) enc = None - enc_url = self.__get_dynamic_attr('enclosure_url', item) + enc_url = self.__get_dynamic_attr('item_enclosure_url', item) if enc_url: enc = feedgenerator.Enclosure( url = enc_url.decode('utf-8'), - length = str(self.__get_dynamic_attr('enclosure_length', item)).decode('utf-8'), - mime_type = self.__get_dynamic_attr('enclosure_mime_type', item).decode('utf-8'), + length = str(self.__get_dynamic_attr('item_enclosure_length', item)).decode('utf-8'), + mime_type = self.__get_dynamic_attr('item_enclosure_mime_type', item).decode('utf-8'), ) feed.add_item( title = title_template.render(Context({'obj': item, 'site': current_site})).decode('utf-8'), diff --git a/docs/authentication.txt b/docs/authentication.txt index 55334b697a..e0780902c1 100644 --- a/docs/authentication.txt +++ b/docs/authentication.txt @@ -474,3 +474,8 @@ messages are made available in the `template context`_ as the template variable Note that ``DjangoContext`` calls ``get_and_delete_messages`` behind the scenes, so any messages will be deleted even if you don't display them. + +Finally, note that this messages framework only works with users in the user +database. To send messages to anonymous users, use the `session framework`_. + +.. _session framework: http://www.djangoproject.com/documentation/sessions/ diff --git a/docs/settings.txt b/docs/settings.txt index f14d48b257..9b7eb2004a 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -416,7 +416,11 @@ Example: ``"http://media.lawrence.com"`` MIDDLEWARE_CLASSES ------------------ -Default: ``("django.middleware.sessions.SessionMiddleware", "django.middleware.common.CommonMiddleware", "django.middleware.doc.XViewMiddleware")`` +Default:: + + ("django.middleware.sessions.SessionMiddleware", + "django.middleware.common.CommonMiddleware", + "django.middleware.doc.XViewMiddleware") A tuple of middleware classes to use. See the `middleware docs`_.