Merge tag 'upstream/7.8.1'

Upstream version 7.8.1

# gpg: Firmado el mar 15 nov 2016 14:18:48 ART
# gpg:                usando RSA clave A6C7B88B9583046A11C5403E0B00FB6CEBE2D002
# gpg: Firma correcta de "Ulises Vitulli <dererk@debian.org>" [absoluta]
# gpg:                 alias "Dererk <dererk@torproject.org>" [absoluta]
# gpg:                 alias "Ulises Vitulli <uvitulli@fi.uba.ar>" [absoluta]
# gpg:                 alias "Ulises Vitulli <dererk@satellogic.com>" [absoluta]

1 files changed, 15 insertions, 9 deletions

diff --git a/nikola/plugins/task/rss.py b/nikola/plugins/task/rss.py
index 9020a06..780559b 100644
--- a/nikola/plugins/task/rss.py
+++ b/nikola/plugins/task/rss.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright © 2012-2015 Roberto Alsina and others.
+# Copyright © 2012-2016 Roberto Alsina and others.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -34,11 +34,11 @@ except ImportError:
     from urllib.parse import urljoin  # NOQA
 
 from nikola import utils
+from nikola.nikola import _enclosure
 from nikola.plugin_categories import Task
 
 
 class GenerateRSS(Task):
-
     """Generate RSS feeds."""
 
     name = "generate_rss"
@@ -58,13 +58,14 @@ class GenerateRSS(Task):
             "base_url": self.site.config["BASE_URL"],
             "blog_description": self.site.config["BLOG_DESCRIPTION"],
             "output_folder": self.site.config["OUTPUT_FOLDER"],
-            "rss_teasers": self.site.config["RSS_TEASERS"],
-            "rss_plain": self.site.config["RSS_PLAIN"],
+            "feed_teasers": self.site.config["FEED_TEASERS"],
+            "feed_plain": self.site.config["FEED_PLAIN"],
             "show_untranslated_posts": self.site.config['SHOW_UNTRANSLATED_POSTS'],
             "feed_length": self.site.config['FEED_LENGTH'],
+            "feed_previewimage": self.site.config["FEED_PREVIEWIMAGE"],
             "tzinfo": self.site.tzinfo,
-            "rss_read_more_link": self.site.config["RSS_READ_MORE_LINK"],
-            "rss_links_append_query": self.site.config["RSS_LINKS_APPEND_QUERY"],
+            "feed_read_more_link": self.site.config["FEED_READ_MORE_LINK"],
+            "feed_links_append_query": self.site.config["FEED_LINKS_APPEND_QUERY"],
         }
         self.site.scan_posts()
         # Check for any changes in the state of use_in_feeds for any post.
@@ -96,8 +97,8 @@ class GenerateRSS(Task):
                 'actions': [(utils.generic_rss_renderer,
                             (lang, kw["blog_title"](lang), kw["site_url"],
                              kw["blog_description"](lang), posts, output_name,
-                             kw["rss_teasers"], kw["rss_plain"], kw['feed_length'], feed_url,
-                             None, kw["rss_links_append_query"]))],
+                             kw["feed_teasers"], kw["feed_plain"], kw['feed_length'], feed_url,
+                             _enclosure, kw["feed_links_append_query"]))],
 
                 'task_dep': ['render_posts'],
                 'clean': True,
@@ -106,6 +107,11 @@ class GenerateRSS(Task):
             yield utils.apply_filters(task, kw['filters'])
 
     def rss_path(self, name, lang):
-        """Return RSS path."""
+        """A link to the RSS feed path.
+
+        Example:
+
+        link://rss => /blog/rss.xml
+        """
         return [_f for _f in [self.site.config['TRANSLATIONS'][lang],
                               self.site.config['RSS_PATH'], 'rss.xml'] if _f]