Merge pull request #2766 from silviot/stable

Make javascript search work in python 3

CHANGES

@@ -23,6 +23,7 @@ Features added
 Bugs fixed
 ----------
 
+* jsdump fix for python 3: fixes the HTML search on python > 3
 * #2676: (latex) Error with verbatim text in captions since Sphinx 1.4.4
 * #2629: memoir class crashes LaTeX. Fixed ``by latex_keep_old_macro_names=False`` (ref 2675)
 * #2684: `sphinx.ext.intersphinx` crashes with six-1.4.1

sphinx/util/jsdump.py

@@ -19,7 +19,7 @@ from sphinx.util.pycompat import u
 _str_re  = re.compile(r'"(\\\\|\\"|[^"])*"')
 _int_re  = re.compile(r'\d+')
 _name_re = re.compile(r'[a-zA-Z]\w*')
-_nameonly_re = re.compile(r'[a-zA-Z]\w*$')
+_nameonly_re = re.compile(r'[a-zA-Z_][a-zA-Z0-9_]*$')
 
 # escape \, ", control characters and everything outside ASCII
 ESCAPE_ASCII = re.compile(r'([\\"]|[^\ -~])')

tests/test_util_jsdump.py

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+def test_jsdump():
+    from sphinx.util.jsdump import dumps
+
+    assert dumps({'1a': 1}) == '{"1a":1}'
+    assert dumps({'a1': 1}) == '{a1:1}'
+
+    assert dumps({u'a\xe8': 1}) == '{"a\\u00e8":1}'