merge with 1.0

This commit is contained in:
Georg Brandl
2010-10-16 21:43:48 +02:00

View File

@@ -164,16 +164,19 @@ def copy_static_entry(source, targetdir, builder, context={},
_DEBUG_HEADER = '''\ _DEBUG_HEADER = '''\
# Sphinx version: %s # Sphinx version: %s
# Python version: %s
# Docutils version: %s %s # Docutils version: %s %s
# Jinja2 version: %s # Jinja2 version: %s
''' '''
def save_traceback(): def save_traceback():
"""Save the current exception's traceback in a temporary file.""" """Save the current exception's traceback in a temporary file."""
import platform
exc = traceback.format_exc() exc = traceback.format_exc()
fd, path = tempfile.mkstemp('.log', 'sphinx-err-') fd, path = tempfile.mkstemp('.log', 'sphinx-err-')
os.write(fd, (_DEBUG_HEADER % os.write(fd, (_DEBUG_HEADER %
(sphinx.__version__, (sphinx.__version__,
platform.python_version(),
docutils.__version__, docutils.__version_details__, docutils.__version__, docutils.__version_details__,
jinja2.__version__)).encode('utf-8')) jinja2.__version__)).encode('utf-8'))
os.write(fd, exc.encode('utf-8')) os.write(fd, exc.encode('utf-8'))