Merge branch 'master' into refactor_highlighter

tests/roots/test-ext-viewcode-find/conf.py

@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import os
-import sys
-
 extensions = ['sphinx.ext.viewcode']
 master_doc = 'index'
 exclude_patterns = ['_build']

tests/roots/test-ext-viewcode-find/not_a_package/submodule.py

@@ -3,6 +3,7 @@ submodule
 """
 raise RuntimeError('This module should not get imported')
 
+
 def decorator(f):
     return f
 

tests/roots/test-inheritance/dummy/test.py

@@ -1,4 +1,4 @@
-"""
+r"""
 
     Test with a class diagram like this::
 

tests/roots/test-latex-equations/conf.py

@@ -2,4 +2,3 @@
 
 master_doc = 'equations'
 extensions = ['sphinx.ext.imgmath']
-