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.
........

diff --git a/Doc/tools/sphinx-build.py b/Doc/tools/sphinx-build.py
index 94a8df8f08f5593f6a1155bf863e27242a16c15b..a0bd7fa0db08ed8adcdcb46d06c1b568ce8382ff 100644 (file)
--- 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__':