From: Georg Brandl <georg@python.org>
Date: Tue, 3 Aug 2010 12:34:35 +0000 (+0000)
Subject: Merged revisions 83660 via svnmerge from
X-Git-Tag: v3.1.3rc1~406
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=224cea189220a6b44a510154044d75500737d85c;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 83660 via svnmerge from
svn+ssh://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.
........
---

diff --git a/Doc/tools/sphinx-build.py b/Doc/tools/sphinx-build.py
index e87b6c076b59..91be6f09a793 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__':