summaryrefslogtreecommitdiffstats
path: root/Doc/tools
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-08-03 12:34:07 (GMT)
committerGeorg Brandl <georg@python.org>2010-08-03 12:34:07 (GMT)
commit6ff81bf4cb041a76a182f66dd8f41b57c6437315 (patch)
tree34f0e50991705fb2ffc327002d9c2a044e0e80b7 /Doc/tools
parent22e3e694ed703cb0a6e1dcb6bd250c74808b9602 (diff)
downloadcpython-6ff81bf4cb041a76a182f66dd8f41b57c6437315.zip
cpython-6ff81bf4cb041a76a182f66dd8f41b57c6437315.tar.gz
cpython-6ff81bf4cb041a76a182f66dd8f41b57c6437315.tar.bz2
Merged revisions 83660 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83660 | georg.brandl | 2010-08-03 14:31:59 +0200 (Di, 03 Aug 2010) | 1 line Get rid of UserWarnings when running Sphinx from tools dir. ........
Diffstat (limited to 'Doc/tools')
-rw-r--r--Doc/tools/sphinx-build.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/Doc/tools/sphinx-build.py b/Doc/tools/sphinx-build.py
index 94a8df8..a0bd7fa 100644
--- a/Doc/tools/sphinx-build.py
+++ b/Doc/tools/sphinx-build.py
@@ -3,11 +3,15 @@
Sphinx - Python documentation toolchain
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- :copyright: 2007 by Georg Brandl.
+ :copyright: 2007-2010 by Georg Brandl.
:license: Python license.
"""
import sys
+import warnings
+
+# Get rid of UserWarnings reported by pkg_resources.
+warnings.filterwarnings('ignore', category=UserWarning, module='jinja2')
if __name__ == '__main__':