Restore doctype in header permalinks/deduplicate IDs filters

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Aug 21, 2017 · c5d3e3f · c5d3e3f
1 parent 84b0c62
commit c5d3e3f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -24,6 +24,8 @@ Features
 Bugfixes
 --------
 
+* Do not remove doctype if ``add_header_permalinks`` or
+  ``deduplicate_ids`` are used
 * Handle empty slug metadata (Issue #2887)
 * Fix crash when compiling empty ``.html`` posts (Issue #2851)
 * Make failures to get source commit hash non-fatal in

diff --git a/nikola/filters.py b/nikola/filters.py
@@ -156,7 +156,7 @@ def yui_compressor(infile, executable=None):
         try:
             subprocess.call('yuicompressor', stdout=open(os.devnull, 'w'), stderr=open(os.devnull, 'w'))
             yuicompressor = 'yuicompressor'
-        except:
+        except Exception:
             raise Exception("yui-compressor is not installed.")
             return False
 
@@ -394,7 +394,7 @@ def _normalize_html(data):
     """Pass HTML through LXML to clean it up, if possible."""
     try:
         data = lxml.html.tostring(lxml.html.fromstring(data), encoding='unicode')
-    except:
+    except Exception:
         pass
     return '<!DOCTYPE html>\n' + data
 
@@ -446,7 +446,7 @@ def add_header_permalinks(fname, xpath_list=None, file_blacklist=None):
             node.append(new_node)
 
     with io.open(fname, 'w', encoding='utf-8') as outf:
-        outf.write(lxml.html.tostring(doc, encoding="unicode"))
+        outf.write('<!DOCTYPE html>\n' + lxml.html.tostring(doc, encoding="unicode"))
 
 
 @_ConfigurableFilter(top_classes='DEDUPLICATE_IDS_TOP_CLASSES')
@@ -496,6 +496,6 @@ def deduplicate_ids(data, top_classes=None):
                     if hl.attrib['href'] == '#' + i:
                         hl.attrib['href'] = '#' + new_id
                         break
-        return lxml.html.tostring(doc, encoding='unicode')
+        return '<!DOCTYPE html>\n' + lxml.html.tostring(doc, encoding='unicode')
     else:
         return data