Merge branch 'stable' into fix/referenced_todo

CHANGES

@@ -17,6 +17,7 @@ Features added
 * #4112: Don't override the smart_quotes setting if it was already set
 * #4125: Display reference texts of original and translated passages on
   i18n warning message
+* #4147: Include the exception when logging PO/MO file read/write
 
 Bugs fixed
 ----------
@@ -28,6 +29,7 @@ Bugs fixed
 * #4070, #4111: crashes when the warning message contains format strings (again)
 * #4108: Search word highlighting breaks SVG images
 * #3692: Unable to build HTML if writing .buildinfo failed
+* #4152: HTML writer crashes if a field list is placed on top of the document
 * #4063: Sphinx crashes when labelling directive '.. todolist::'
 
 Testing

sphinx/util/i18n.py

@@ -67,15 +67,15 @@ class CatalogInfo(LocaleFileInfoBase):
         with io.open(self.po_path, 'rt', encoding=self.charset) as file_po:
             try:
                 po = read_po(file_po, locale)
-            except Exception:
-                logger.warning('reading error: %s', self.po_path)
+            except Exception as exc:
+                logger.warning('reading error: %s, %s', self.po_path, exc)
                 return
 
         with io.open(self.mo_path, 'wb') as file_mo:
             try:
                 write_mo(file_mo, po)
-            except Exception:
-                logger.warning('writing error: %s', self.mo_path)
+            except Exception as exc:
+                logger.warning('writing error: %s, %s', self.mo_path, exc)
 
 
 def find_catalog(docname, compaction):

sphinx/writers/html.py

@@ -89,6 +89,7 @@ class HTMLTranslator(BaseTranslator):
         self.param_separator = ''
         self.optional_param_level = 0
         self._table_row_index = 0
+        self._fieldlist_row_index = 0
         self.required_params_left = 0
 
     def visit_start_of_file(self, node):