Merge wiht 'stable'

5 files changed, 38 insertions, 1 deletions

diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index 9079dcec9..7dc89d39a 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -17,7 +17,7 @@ import inspect
 import traceback
 from types import FunctionType, BuiltinFunctionType, MethodType
 
-from six import iterkeys, iteritems, itervalues, text_type, class_types, \
+from six import PY2, iterkeys, iteritems, itervalues, text_type, class_types, \
     string_types, StringIO
 from docutils import nodes
 from docutils.utils import assemble_option_dict
@@ -532,6 +532,8 @@ class Documenter(object):
             else:
                 errmsg += '; the following exception was raised:\n%s' % \
                           traceback.format_exc()
+            if PY2:
+                errmsg = errmsg.decode('utf-8')
             dbg(errmsg)
             self.directive.warn(errmsg)
             self.env.note_reread()
diff --git a/sphinx/themes/agogo/static/agogo.css_t b/sphinx/themes/agogo/static/agogo.css_t
index 26df9d6d5..f3c8d67d5 100644
--- a/sphinx/themes/agogo/static/agogo.css_t
+++ b/sphinx/themes/agogo/static/agogo.css_t
@@ -507,3 +507,13 @@ div.code-block-caption {
     padding: 2px 5px;
     font-size: small;
 }
+
+/* -- math display ---------------------------------------------------------- */
+
+div.body div.math p {
+    text-align: center;
+}
+
+span.eqno {
+    float: right;
+}
diff --git a/sphinx/themes/haiku/static/haiku.css_t b/sphinx/themes/haiku/static/haiku.css_t
index 0c20fd5c1..4fc150106 100644
--- a/sphinx/themes/haiku/static/haiku.css_t
+++ b/sphinx/themes/haiku/static/haiku.css_t
@@ -369,3 +369,8 @@ div.viewcode-block:target {
     margin: -1px -10px;
     padding: 0 12px;
 }
+
+/* math display */
+div.math p {
+    text-align: center;
+}
diff --git a/sphinx/themes/scrolls/static/scrolls.css_t b/sphinx/themes/scrolls/static/scrolls.css_t
index 83752c9d1..12bb7755e 100644
--- a/sphinx/themes/scrolls/static/scrolls.css_t
+++ b/sphinx/themes/scrolls/static/scrolls.css_t
@@ -471,3 +471,13 @@ div.figure p.caption span.caption-number {
 
 div.figure p.caption span.caption-text {
 }
+
+/* math display */
+
+div.math p {
+    text-align: center;
+}
+
+span.eqno {
+    float: right;
+}
diff --git a/sphinx/themes/traditional/static/traditional.css_t b/sphinx/themes/traditional/static/traditional.css_t
index b98de2268..1e1127eda 100644
--- a/sphinx/themes/traditional/static/traditional.css_t
+++ b/sphinx/themes/traditional/static/traditional.css_t
@@ -736,3 +736,13 @@ div.figure p.caption span.caption-number {
 
 div.figure p.caption span.caption-text {
 }
+
+/* :::: MATH DISPLAY :::: */
+
+div.body div.math p {
+    text-align: center;
+}
+
+span.eqno {
+    float: right;
+}