fix #1674 -- don’t use sets for FAVICONS

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · May 2, 2015 · 6d6682e · 6d6682e
1 parent 7c7531d
commit 6d6682e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -19,6 +19,7 @@ Features
 Bugfixes
 --------
 
+* Don’t use sets for ``FAVICONS`` (Issue #1674)
 * Posts/Pages that use post-list will never be up to date (Issue #1671)
 * Support using post.text() in post_list_directive.tmpl (Issue #1671)
 * Avoid recursive dep when using post-list in a post (Issue #1671)

diff --git a/nikola/conf.py.in b/nikola/conf.py.in
@@ -529,12 +529,12 @@ IMAGE_FOLDERS = {'images': 'images'}
 # You can also use: page/concave/linear/none/default
 
 # FAVICONS contains (name, file, size) tuples.
-# Used for create favicon link like this:
+# Used to create favicon link like this:
 # <link rel="name" href="file" sizes="size"/>
-# FAVICONS = {
+# FAVICONS = (
 #     ("icon", "/favicon.ico", "16x16"),
 #     ("icon", "/icon_128x128.png", "128x128"),
-# }
+# )
 
 # Show only teasers in the index pages? Defaults to False.
 # INDEX_TEASERS = False

diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -345,7 +345,7 @@ def __init__(self, **config):
             'EXTRA_PLUGINS_DIRS': [],
             'COMMENT_SYSTEM_ID': 'nikolademo',
             'EXTRA_HEAD_DATA': '',
-            'FAVICONS': {},
+            'FAVICONS': (),
             'FEED_LENGTH': 10,
             'FILE_METADATA_REGEXP': None,
             'ADDITIONAL_METADATA': {},