[Python-checkins] r83662 - in python/branches/release31-maint: Doc/tools/sphinx-build.py

[georg.brandl]

Author: georg.brandl
Date: Tue Aug  3 14:34:35 2010
New Revision: 83662

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/tools/sphinx-build.py

Modified: python/branches/release31-maint/Doc/tools/sphinx-build.py
==============================================================================
--- python/branches/release31-maint/Doc/tools/sphinx-build.py	(original)
+++ python/branches/release31-maint/Doc/tools/sphinx-build.py	Tue Aug  3 14:34:35 2010
@@ -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__':