Merge branch 'stable'

CHANGES

@@ -142,7 +142,7 @@ Deprecated
   ``False``.
 * #3221: epub2 builder is deprecated
 
-Release 1.5.5 (in development)
+Release 1.5.6 (in development)
 ==============================
 
 Incompatible changes
@@ -160,6 +160,15 @@ Bugs fixed
 Testing
 --------
 
+Release 1.5.5 (released Apr 03, 2017)
+=====================================
+
+Bugs fixed
+----------
+
+* #3597: python domain raises UnboundLocalError if invalid name given
+* #3599: Move to new Mathjax CDN
+
 Release 1.5.4 (released Apr 02, 2017)
 =====================================
 

sphinx/domains/python.py

@@ -332,6 +332,7 @@ class PyObject(ObjectDescription):
         only the most recent object is tracked. This object prefix name will be
         removed with :py:meth:`after_content`.
         """
+        prefix = None
         if self.names:
             # fullname and name_prefix come from the `handle_signature` method.
             # fullname represents the full object name that is constructed using
@@ -342,8 +343,6 @@ class PyObject(ObjectDescription):
                 prefix = fullname
             elif name_prefix:
                 prefix = name_prefix.strip('.')
-            else:
-                prefix = None
         if prefix:
             self.env.ref_context['py:class'] = prefix
             if self.allow_nesting:

sphinx/ext/mathjax.py

@@ -74,7 +74,7 @@ def setup(app):
     # more information for mathjax secure url is here:
     # http://docs.mathjax.org/en/latest/start.html#secure-access-to-the-cdn
     app.add_config_value('mathjax_path',
-                         'https://cdn.mathjax.org/mathjax/latest/MathJax.js?'
+                         'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?'
                          'config=TeX-AMS-MML_HTMLorMML', False)
     app.add_config_value('mathjax_inline', [r'\(', r'\)'], 'html')
     app.add_config_value('mathjax_display', [r'\[', r'\]'], 'html')