Merge lp:~andrewsomething/ubuntu/precise/sphinx/1.1.3+dfsg-2ubuntu1 into lp:ubuntu/precise/sphinx

[Andrew Starr-Bochicchio]

Merge new upstream bugfix release from Debian Testing.

Please wait to upload until after Beta Freeze is lifted, sphinx is seeded.

[Didier Roche-Tolomelli (didrocks)]

Hey Andrew!
After a discussion with Martin:

didrocks | pitti: do you think: should I sponsor in -proposed, don't do anything for packages in main until beta freeze is lifted? (or just upload in main and the release team won't approve it until
         | the freeze is lifted)
   pitti | didrocks: the latter usually
   pitti | didrocks: there's plenty of stuff in unapproved which is for after beta-2
didrocks | ok, wasn't sure for main components though ;)

The changes looks good, let's stage it in the UNAPPROVED queue until we unfreeze. Thanks again Andrew :)

review: Approve

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2012-02-05 19:33:59 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-disable_distribute_setup.diff
-unversioned_grammar_pickle.diff
-show_more_stack_frames.diff
-initialize_autodoc.diff
-sphinxcontrib_namespace.diff

=== removed directory '.pc/disable_distribute_setup.diff'
=== removed file '.pc/disable_distribute_setup.diff/setup.py'
--- .pc/disable_distribute_setup.diff/setup.py	2011-11-20 15:56:50 +0000
+++ .pc/disable_distribute_setup.diff/setup.py	1970-01-01 00:00:00 +0000
@@ -1,208 +0,0 @@
-# -*- coding: utf-8 -*-
-try:
-    from setuptools import setup, find_packages
-except ImportError:
-    import distribute_setup
-    distribute_setup.use_setuptools()
-    from setuptools import setup, find_packages
-
-import os
-import sys
-from distutils import log
-
-import sphinx
-
-long_desc = '''
-Sphinx is a tool that makes it easy to create intelligent and beautiful
-documentation for Python projects (or other documents consisting of multiple
-reStructuredText sources), written by Georg Brandl.  It was originally created
-for the new Python documentation, and has excellent facilities for Python
-project documentation, but C/C++ is supported as well, and more languages are
-planned.
-
-Sphinx uses reStructuredText as its markup language, and many of its strengths
-come from the power and straightforwardness of reStructuredText and its parsing
-and translating suite, the Docutils.
-
-Among its features are the following:
-
-* Output formats: HTML (including derivative formats such as HTML Help, Epub
-  and Qt Help), plain text, manual pages and LaTeX or direct PDF output
-  using rst2pdf
-* Extensive cross-references: semantic markup and automatic links
-  for functions, classes, glossary terms and similar pieces of information
-* Hierarchical structure: easy definition of a document tree, with automatic
-  links to siblings, parents and children
-* Automatic indices: general index as well as a module index
-* Code handling: automatic highlighting using the Pygments highlighter
-* Flexible HTML output using the Jinja 2 templating engine
-* Various extensions are available, e.g. for automatic testing of snippets
-  and inclusion of appropriately formatted docstrings
-* Setuptools integration
-
-A development egg can be found `here
-<http://bitbucket.org/birkenfeld/sphinx/get/tip.gz#egg=Sphinx-dev>`_.
-'''
-
-requires = ['Pygments>=1.2', 'Jinja2>=2.3', 'docutils>=0.7']
-
-if sys.version_info < (2, 4):
-    print('ERROR: Sphinx requires at least Python 2.4 to run.')
-    sys.exit(1)
-
-if sys.version_info < (2, 5):
-    # Python 2.4's distutils doesn't automatically install an egg-info,
-    # so an existing docutils install won't be detected -- in that case,
-    # remove the dependency from setup.py
-    try:
-        import docutils
-        if int(docutils.__version__[2]) < 4:
-            raise ValueError('docutils not recent enough')
-    except:
-        pass
-    else:
-        del requires[-1]
-
-    # The uuid module is new in the stdlib in 2.5
-    requires.append('uuid>=1.30')
-
-
-# Provide a "compile_catalog" command that also creates the translated
-# JavaScript files if Babel is available.
-
-cmdclass = {}
-
-try:
-    from babel.messages.pofile import read_po
-    from babel.messages.frontend import compile_catalog
-    try:
-        from simplejson import dump
-    except ImportError:
-        from json import dump
-except ImportError:
-    pass
-else:
-    class compile_catalog_plusjs(compile_catalog):
-        """
-        An extended command that writes all message strings that occur in
-        JavaScript files to a JavaScript file along with the .mo file.
-
-        Unfortunately, babel's setup command isn't built very extensible, so
-        most of the run() code is duplicated here.
-        """
-
-        def run(self):
-            compile_catalog.run(self)
-
-            po_files = []
-            js_files = []
-
-            if not self.input_file:
-                if self.locale:
-                    po_files.append((self.locale,
-                                     os.path.join(self.directory, self.locale,
-                                                  'LC_MESSAGES',
-                                                  self.domain + '.po')))
-                    js_files.append(os.path.join(self.directory, self.locale,
-                                                 'LC_MESSAGES',
-                                                 self.domain + '.js'))
-                else:
-                    for locale in os.listdir(self.directory):
-                        po_file = os.path.join(self.directory, locale,
-                                               'LC_MESSAGES',
-                                               self.domain + '.po')
-                        if os.path.exists(po_file):
-                            po_files.append((locale, po_file))
-                            js_files.append(os.path.join(self.directory, locale,
-                                                         'LC_MESSAGES',
-                                                         self.domain + '.js'))
-            else:
-                po_files.append((self.locale, self.input_file))
-                if self.output_file:
-                    js_files.append(self.output_file)
-                else:
-                    js_files.append(os.path.join(self.directory, self.locale,
-                                                 'LC_MESSAGES',
-                                                 self.domain + '.js'))
-
-            for js_file, (locale, po_file) in zip(js_files, po_files):
-                infile = open(po_file, 'r')
-                try:
-                    catalog = read_po(infile, locale)
-                finally:
-                    infile.close()
-
-                if catalog.fuzzy and not self.use_fuzzy:
-                    continue
-
-                log.info('writing JavaScript strings in catalog %r to %r',
-                         po_file, js_file)
-
-                jscatalog = {}
-                for message in catalog:
-                    if any(x[0].endswith('.js') for x in message.locations):
-                        msgid = message.id
-                        if isinstance(msgid, (list, tuple)):
-                            msgid = msgid[0]
-                        jscatalog[msgid] = message.string
-
-                outfile = open(js_file, 'wb')
-                try:
-                    outfile.write('Documentation.addTranslations(');
-                    dump(dict(
-                        messages=jscatalog,
-                        plural_expr=catalog.plural_expr,
-                        locale=str(catalog.locale)
-                        ), outfile)
-                    outfile.write(');')
-                finally:
-                    outfile.close()
-
-    cmdclass['compile_catalog'] = compile_catalog_plusjs
-
-
-setup(
-    name='Sphinx',
-    version=sphinx.__version__,
-    url='http://sphinx.pocoo.org/',
-    download_url='http://pypi.python.org/pypi/Sphinx',
-    license='BSD',
-    author='Georg Brandl',
-    author_email='[e-mail]',
-    description='Python documentation generator',
-    long_description=long_desc,
-    zip_safe=False,
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: Console',
-        'Environment :: Web Environment',
-        'Intended Audience :: Developers',
-        'Intended Audience :: Education',
-        'License :: OSI Approved :: BSD License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 3',
-        'Topic :: Documentation',
-        'Topic :: Text Processing',
-        'Topic :: Utilities',
-    ],
-    platforms='any',
-    packages=find_packages(exclude=['custom_fixers', 'test']),
-    include_package_data=True,
-    entry_points={
-        'console_scripts': [
-            'sphinx-build = sphinx:main',
-            'sphinx-quickstart = sphinx.quickstart:main',
-            'sphinx-apidoc = sphinx.apidoc:main',
-            'sphinx-autogen = sphinx.ext.autosummary.generate:main',
-        ],
-        'distutils.commands': [
-            'build_sphinx = sphinx.setup_command:BuildDoc',
-        ],
-    },
-    install_requires=requires,
-    cmdclass=cmdclass,
-    use_2to3=True,
-    use_2to3_fixers=['custom_fixers'],
-)

=== removed directory '.pc/initialize_autodoc.diff'
=== removed directory '.pc/initialize_autodoc.diff/sphinx'
=== removed directory '.pc/initialize_autodoc.diff/sphinx/ext'
=== removed directory '.pc/initialize_autodoc.diff/sphinx/ext/autosummary'
=== removed file '.pc/initialize_autodoc.diff/sphinx/ext/autosummary/generate.py'
--- .pc/initialize_autodoc.diff/sphinx/ext/autosummary/generate.py	2012-02-05 19:33:59 +0000
+++ .pc/initialize_autodoc.diff/sphinx/ext/autosummary/generate.py	1970-01-01 00:00:00 +0000
@@ -1,319 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    sphinx.ext.autosummary.generate
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    Usable as a library or script to generate automatic RST source files for
-    items referred to in autosummary:: directives.
-
-    Each generated RST file contains a single auto*:: directive which
-    extracts the docstring of the referred item.
-
-    Example Makefile rule::
-
-       generate:
-               sphinx-autogen -o source/generated source/*.rst
-
-    :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-"""
-
-import os
-import re
-import sys
-import pydoc
-import optparse
-
-from jinja2 import FileSystemLoader, TemplateNotFound
-from jinja2.sandbox import SandboxedEnvironment
-
-from sphinx import package_dir
-from sphinx.ext.autosummary import import_by_name, get_documenter
-from sphinx.jinja2glue import BuiltinTemplateLoader
-from sphinx.util.osutil import ensuredir
-from sphinx.util.inspect import safe_getattr
-
-def main(argv=sys.argv):
-    usage = """%prog [OPTIONS] SOURCEFILE ..."""
-    p = optparse.OptionParser(usage.strip())
-    p.add_option("-o", "--output-dir", action="store", type="string",
-                 dest="output_dir", default=None,
-                 help="Directory to place all output in")
-    p.add_option("-s", "--suffix", action="store", type="string",
-                 dest="suffix", default="rst",
-                 help="Default suffix for files (default: %default)")
-    p.add_option("-t", "--templates", action="store", type="string",
-                 dest="templates", default=None,
-                 help="Custom template directory (default: %default)")
-    options, args = p.parse_args(argv[1:])
-
-    if len(args) < 1:
-        p.error('no input files given')
-
-    generate_autosummary_docs(args, options.output_dir,
-                              "." + options.suffix,
-                              template_dir=options.templates)
-
-def _simple_info(msg):
-    print msg
-
-def _simple_warn(msg):
-    print >> sys.stderr, 'WARNING: ' + msg
-
-# -- Generating output ---------------------------------------------------------
-
-def generate_autosummary_docs(sources, output_dir=None, suffix='.rst',
-                              warn=_simple_warn, info=_simple_info,
-                              base_path=None, builder=None, template_dir=None):
-
-    showed_sources = list(sorted(sources))
-    if len(showed_sources) > 20:
-        showed_sources = showed_sources[:10] + ['...'] + showed_sources[-10:]
-    info('[autosummary] generating autosummary for: %s' %
-         ', '.join(showed_sources))
-
-    if output_dir:
-        info('[autosummary] writing to %s' % output_dir)
-
-    if base_path is not None:
-        sources = [os.path.join(base_path, filename) for filename in sources]
-
-    # create our own templating environment
-    template_dirs = [os.path.join(package_dir, 'ext',
-                                  'autosummary', 'templates')]
-    if builder is not None:
-        # allow the user to override the templates
-        template_loader = BuiltinTemplateLoader()
-        template_loader.init(builder, dirs=template_dirs)
-    else:
-        if template_dir:
-            template_dirs.insert(0, template_dir)
-        template_loader = FileSystemLoader(template_dirs)
-    template_env = SandboxedEnvironment(loader=template_loader)
-
-    # read
-    items = find_autosummary_in_files(sources)
-
-    # remove possible duplicates
-    items = dict([(item, True) for item in items]).keys()
-
-    # keep track of new files
-    new_files = []
-
-    # write
-    for name, path, template_name in sorted(items):
-        if path is None:
-            # The corresponding autosummary:: directive did not have
-            # a :toctree: option
-            continue
-
-        path = output_dir or os.path.abspath(path)
-        ensuredir(path)
-
-        try:
-            name, obj, parent = import_by_name(name)
-        except ImportError, e:
-            warn('[autosummary] failed to import %r: %s' % (name, e))
-            continue
-
-        fn = os.path.join(path, name + suffix)
-
-        # skip it if it exists
-        if os.path.isfile(fn):
-            continue
-
-        new_files.append(fn)
-
-        f = open(fn, 'w')
-
-        try:
-            doc = get_documenter(obj, parent)
-
-            if template_name is not None:
-                template = template_env.get_template(template_name)
-            else:
-                try:
-                    template = template_env.get_template('autosummary/%s.rst'
-                                                         % doc.objtype)
-                except TemplateNotFound:
-                    template = template_env.get_template('autosummary/base.rst')
-
-            def get_members(obj, typ, include_public=[]):
-                items = []
-                for name in dir(obj):
-                    try:
-                        documenter = get_documenter(safe_getattr(obj, name),
-                                                    obj)
-                    except AttributeError:
-                        continue
-                    if documenter.objtype == typ:
-                        items.append(name)
-                public = [x for x in items
-                          if x in include_public or not x.startswith('_')]
-                return public, items
-
-            ns = {}
-
-            if doc.objtype == 'module':
-                ns['members'] = dir(obj)
-                ns['functions'], ns['all_functions'] = \
-                                   get_members(obj, 'function')
-                ns['classes'], ns['all_classes'] = \
-                                 get_members(obj, 'class')
-                ns['exceptions'], ns['all_exceptions'] = \
-                                   get_members(obj, 'exception')
-            elif doc.objtype == 'class':
-                ns['members'] = dir(obj)
-                ns['methods'], ns['all_methods'] = \
-                                 get_members(obj, 'method', ['__init__'])
-                ns['attributes'], ns['all_attributes'] = \
-                                 get_members(obj, 'attribute')
-
-            parts = name.split('.')
-            if doc.objtype in ('method', 'attribute'):
-                mod_name = '.'.join(parts[:-2])
-                cls_name = parts[-2]
-                obj_name = '.'.join(parts[-2:])
-                ns['class'] = cls_name
-            else:
-                mod_name, obj_name = '.'.join(parts[:-1]), parts[-1]
-
-            ns['fullname'] = name
-            ns['module'] = mod_name
-            ns['objname'] = obj_name
-            ns['name'] = parts[-1]
-
-            ns['objtype'] = doc.objtype
-            ns['underline'] = len(name) * '='
-
-            rendered = template.render(**ns)
-            f.write(rendered)
-        finally:
-            f.close()
-
-    # descend recursively to new files
-    if new_files:
-        generate_autosummary_docs(new_files, output_dir=output_dir,
-                                  suffix=suffix, warn=warn, info=info,
-                                  base_path=base_path, builder=builder,
-                                  template_dir=template_dir)
-
-
-# -- Finding documented entries in files ---------------------------------------
-
-def find_autosummary_in_files(filenames):
-    """Find out what items are documented in source/*.rst.
-
-    See `find_autosummary_in_lines`.
-    """
-    documented = []
-    for filename in filenames:
-        f = open(filename, 'r')
-        lines = f.read().splitlines()
-        documented.extend(find_autosummary_in_lines(lines, filename=filename))
-        f.close()
-    return documented
-
-def find_autosummary_in_docstring(name, module=None, filename=None):
-    """Find out what items are documented in the given object's docstring.
-
-    See `find_autosummary_in_lines`.
-    """
-    try:
-        real_name, obj, parent = import_by_name(name)
-        lines = pydoc.getdoc(obj).splitlines()
-        return find_autosummary_in_lines(lines, module=name, filename=filename)
-    except AttributeError:
-        pass
-    except ImportError, e:
-        print "Failed to import '%s': %s" % (name, e)
-    return []
-
-def find_autosummary_in_lines(lines, module=None, filename=None):
-    """Find out what items appear in autosummary:: directives in the
-    given lines.
-
-    Returns a list of (name, toctree, template) where *name* is a name
-    of an object and *toctree* the :toctree: path of the corresponding
-    autosummary directive (relative to the root of the file name), and
-    *template* the value of the :template: option. *toctree* and
-    *template* ``None`` if the directive does not have the
-    corresponding options set.
-    """
-    autosummary_re = re.compile(r'^(\s*)\.\.\s+autosummary::\s*')
-    automodule_re = re.compile(
-        r'^\s*\.\.\s+automodule::\s*([A-Za-z0-9_.]+)\s*$')
-    module_re = re.compile(
-        r'^\s*\.\.\s+(current)?module::\s*([a-zA-Z0-9_.]+)\s*$')
-    autosummary_item_re = re.compile(r'^\s+(~?[_a-zA-Z][a-zA-Z0-9_.]*)\s*.*?')
-    toctree_arg_re = re.compile(r'^\s+:toctree:\s*(.*?)\s*$')
-    template_arg_re = re.compile(r'^\s+:template:\s*(.*?)\s*$')
-
-    documented = []
-
-    toctree = None
-    template = None
-    current_module = module
-    in_autosummary = False
-    base_indent = ""
-
-    for line in lines:
-        if in_autosummary:
-            m = toctree_arg_re.match(line)
-            if m:
-                toctree = m.group(1)
-                if filename:
-                    toctree = os.path.join(os.path.dirname(filename),
-                                           toctree)
-                continue
-
-            m = template_arg_re.match(line)
-            if m:
-                template = m.group(1).strip()
-                continue
-
-            if line.strip().startswith(':'):
-                continue # skip options
-
-            m = autosummary_item_re.match(line)
-            if m:
-                name = m.group(1).strip()
-                if name.startswith('~'):
-                    name = name[1:]
-                if current_module and \
-                       not name.startswith(current_module + '.'):
-                    name = "%s.%s" % (current_module, name)
-                documented.append((name, toctree, template))
-                continue
-
-            if not line.strip() or line.startswith(base_indent + " "):
-                continue
-
-            in_autosummary = False
-
-        m = autosummary_re.match(line)
-        if m:
-            in_autosummary = True
-            base_indent = m.group(1)
-            toctree = None
-            template = None
-            continue
-
-        m = automodule_re.search(line)
-        if m:
-            current_module = m.group(1).strip()
-            # recurse into the automodule docstring
-            documented.extend(find_autosummary_in_docstring(
-                current_module, filename=filename))
-            continue
-
-        m = module_re.match(line)
-        if m:
-            current_module = m.group(2)
-            continue
-
-    return documented
-
-
-if __name__ == '__main__':
-    main()

=== removed directory '.pc/show_more_stack_frames.diff'
=== removed directory '.pc/show_more_stack_frames.diff/sphinx'
=== removed file '.pc/show_more_stack_frames.diff/sphinx/cmdline.py'
--- .pc/show_more_stack_frames.diff/sphinx/cmdline.py	2011-11-20 15:56:50 +0000
+++ .pc/show_more_stack_frames.diff/sphinx/cmdline.py	1970-01-01 00:00:00 +0000
@@ -1,228 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    sphinx.cmdline
-    ~~~~~~~~~~~~~~
-
-    sphinx-build command-line handling.
-
-    :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-"""
-
-import os
-import sys
-import getopt
-import traceback
-from os import path
-
-from docutils.utils import SystemMessage
-
-from sphinx import __version__
-from sphinx.errors import SphinxError
-from sphinx.application import Sphinx
-from sphinx.util import Tee, format_exception_cut_frames, save_traceback
-from sphinx.util.console import red, nocolor, color_terminal
-from sphinx.util.pycompat import terminal_safe
-
-
-def usage(argv, msg=None):
-    if msg:
-        print >>sys.stderr, msg
-        print >>sys.stderr
-    print >>sys.stderr, """\
-Sphinx v%s
-Usage: %s [options] sourcedir outdir [filenames...]
-Options: -b <builder> -- builder to use; default is html
-         -a        -- write all files; default is to only write \
-new and changed files
-         -E        -- don't use a saved environment, always read all files
-         -t <tag>  -- include "only" blocks with <tag>
-         -d <path> -- path for the cached environment and doctree files
-                      (default: outdir/.doctrees)
-         -c <path> -- path where configuration file (conf.py) is located
-                      (default: same as sourcedir)
-         -C        -- use no config file at all, only -D options
-         -D <setting=value> -- override a setting in configuration
-         -A <name=value>    -- pass a value into the templates, for HTML builder
-         -n        -- nit-picky mode, warn about all missing references
-         -N        -- do not do colored output
-         -q        -- no output on stdout, just warnings on stderr
-         -Q        -- no output at all, not even warnings
-         -w <file> -- write warnings (and errors) to given file
-         -W        -- turn warnings into errors
-         -P        -- run Pdb on exception
-Modi:
-* without -a and without filenames, write new and changed files.
-* with -a, write all files.
-* with filenames, write these.""" % (__version__, argv[0])
-
-
-def main(argv):
-    if not color_terminal():
-        # Windows' poor cmd box doesn't understand ANSI sequences
-        nocolor()
-
-    try:
-        opts, args = getopt.getopt(argv[1:], 'ab:t:d:c:CD:A:ng:NEqQWw:P')
-        allopts = set(opt[0] for opt in opts)
-        srcdir = confdir = path.abspath(args[0])
-        if not path.isdir(srcdir):
-            print >>sys.stderr, 'Error: Cannot find source directory.'
-            return 1
-        if not path.isfile(path.join(srcdir, 'conf.py')) and \
-               '-c' not in allopts and '-C' not in allopts:
-            print >>sys.stderr, ('Error: Source directory doesn\'t '
-                                 'contain conf.py file.')
-            return 1
-        outdir = path.abspath(args[1])
-        if not path.isdir(outdir):
-            print >>sys.stderr, 'Making output directory...'
-            os.makedirs(outdir)
-    except (IndexError, getopt.error):
-        usage(argv)
-        return 1
-
-    filenames = args[2:]
-    err = 0
-    for filename in filenames:
-        if not path.isfile(filename):
-            print >>sys.stderr, 'Cannot find file %r.' % filename
-            err = 1
-    if err:
-        return 1
-
-    # likely encoding used for command-line arguments
-    try:
-        locale = __import__('locale')  # due to submodule of the same name
-        likely_encoding = locale.getpreferredencoding()
-    except Exception:
-        likely_encoding = None
-
-    buildername = None
-    force_all = freshenv = warningiserror = use_pdb = False
-    status = sys.stdout
-    warning = sys.stderr
-    error = sys.stderr
-    warnfile = None
-    confoverrides = {}
-    tags = []
-    doctreedir = path.join(outdir, '.doctrees')
-    for opt, val in opts:
-        if opt == '-b':
-            buildername = val
-        elif opt == '-a':
-            if filenames:
-                usage(argv, 'Cannot combine -a option and filenames.')
-                return 1
-            force_all = True
-        elif opt == '-t':
-            tags.append(val)
-        elif opt == '-d':
-            doctreedir = path.abspath(val)
-        elif opt == '-c':
-            confdir = path.abspath(val)
-            if not path.isfile(path.join(confdir, 'conf.py')):
-                print >>sys.stderr, ('Error: Configuration directory '
-                                     'doesn\'t contain conf.py file.')
-                return 1
-        elif opt == '-C':
-            confdir = None
-        elif opt == '-D':
-            try:
-                key, val = val.split('=')
-            except ValueError:
-                print >>sys.stderr, ('Error: -D option argument must be '
-                                     'in the form name=value.')
-                return 1
-            try:
-                val = int(val)
-            except ValueError:
-                if likely_encoding:
-                    try:
-                        val = val.decode(likely_encoding)
-                    except UnicodeError:
-                        pass
-            confoverrides[key] = val
-        elif opt == '-A':
-            try:
-                key, val = val.split('=')
-            except ValueError:
-                print >>sys.stderr, ('Error: -A option argument must be '
-                                     'in the form name=value.')
-                return 1
-            try:
-                val = int(val)
-            except ValueError:
-                if likely_encoding:
-                    try:
-                        val = val.decode(likely_encoding)
-                    except UnicodeError:
-                        pass
-            confoverrides['html_context.%s' % key] = val
-        elif opt == '-n':
-            confoverrides['nitpicky'] = True
-        elif opt == '-N':
-            nocolor()
-        elif opt == '-E':
-            freshenv = True
-        elif opt == '-q':
-            status = None
-        elif opt == '-Q':
-            status = None
-            warning = None
-        elif opt == '-W':
-            warningiserror = True
-        elif opt == '-w':
-            warnfile = val
-        elif opt == '-P':
-            use_pdb = True
-
-    if warning and warnfile:
-        warnfp = open(warnfile, 'w')
-        warning = Tee(warning, warnfp)
-        error = warning
-
-    try:
-        app = Sphinx(srcdir, confdir, outdir, doctreedir, buildername,
-                     confoverrides, status, warning, freshenv,
-                     warningiserror, tags)
-        app.build(force_all, filenames)
-        return app.statuscode
-    except KeyboardInterrupt:
-        if use_pdb:
-            import pdb
-            print >>error, red('Interrupted while building, starting debugger:')
-            traceback.print_exc()
-            pdb.post_mortem(sys.exc_info()[2])
-        return 1
-    except Exception, err:
-        if use_pdb:
-            import pdb
-            print >>error, red('Exception occurred while building, '
-                               'starting debugger:')
-            traceback.print_exc()
-            pdb.post_mortem(sys.exc_info()[2])
-        else:
-            print >>error
-            if isinstance(err, SystemMessage):
-                print >>error, red('reST markup error:')
-                print >>error, terminal_safe(err.args[0])
-            elif isinstance(err, SphinxError):
-                print >>error, red('%s:' % err.category)
-                print >>error, terminal_safe(unicode(err))
-            else:
-                print >>error, red('Exception occurred:')
-                print >>error, format_exception_cut_frames().rstrip()
-                tbpath = save_traceback()
-                print >>error, red('The full traceback has been saved '
-                                   'in %s, if you want to report the '
-                                   'issue to the developers.' % tbpath)
-                print >>error, ('Please also report this if it was a user '
-                                'error, so that a better error message '
-                                'can be provided next time.')
-                print >>error, (
-                    'Either send bugs to the mailing list at '
-                    '<http://groups.google.com/group/sphinx-dev/>,\n'
-                    'or report them in the tracker at '
-                    '<http://bitbucket.org/birkenfeld/sphinx/issues/>. Thanks!')
-            return 1

=== removed directory '.pc/sphinxcontrib_namespace.diff'
=== removed directory '.pc/sphinxcontrib_namespace.diff/sphinx'
=== removed file '.pc/sphinxcontrib_namespace.diff/sphinx/__init__.py'
--- .pc/sphinxcontrib_namespace.diff/sphinx/__init__.py	2012-02-03 13:52:49 +0000
+++ .pc/sphinxcontrib_namespace.diff/sphinx/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    Sphinx
-    ~~~~~~
-
-    The Sphinx documentation toolchain.
-
-    :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-"""
-
-# Keep this file executable as-is in Python 3!
-# (Otherwise getting the version out of it from setup.py is impossible.)
-
-import sys
-from os import path
-
-__version__  = '1.1.2'
-__released__ = '1.1.2'  # used when Sphinx builds its own docs
-
-package_dir = path.abspath(path.dirname(__file__))
-
-if '+' in __version__ or 'pre' in __version__:
-    # try to find out the changeset hash if checked out from hg, and append
-    # it to __version__ (since we use this value from setup.py, it gets
-    # automatically propagated to an installed copy as well)
-    try:
-        import subprocess
-        p = subprocess.Popen(['hg', 'id', '-i', '-R',
-                              path.join(package_dir, '..')],
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        out, err = p.communicate()
-        if out:
-            __version__ += '/' + out.strip()
-    except Exception:
-        pass
-
-
-def main(argv=sys.argv):
-    """Sphinx build "main" command-line entry."""
-    if sys.version_info[:3] < (2, 4, 0):
-        sys.stderr.write('Error: Sphinx requires at least '
-                         'Python 2.4 to run.\n')
-        return 1
-
-    try:
-        from sphinx import cmdline
-    except ImportError:
-        err = sys.exc_info()[1]
-        errstr = str(err)
-        if errstr.lower().startswith('no module named'):
-            whichmod = errstr[16:]
-            hint = ''
-            if whichmod.startswith('docutils'):
-                whichmod = 'Docutils library'
-            elif whichmod.startswith('jinja'):
-                whichmod = 'Jinja2 library'
-            elif whichmod == 'roman':
-                whichmod = 'roman module (which is distributed with Docutils)'
-                hint = ('This can happen if you upgraded docutils using\n'
-                        'easy_install without uninstalling the old version'
-                        'first.\n')
-            else:
-                whichmod += ' module'
-            sys.stderr.write('Error: The %s cannot be found. '
-                             'Did you install Sphinx and its dependencies '
-                             'correctly?\n' % whichmod)
-            if hint:
-                sys.stderr.write(hint)
-            return 1
-        raise
-    return cmdline.main(argv)
-
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))

=== removed directory '.pc/unversioned_grammar_pickle.diff'
=== removed directory '.pc/unversioned_grammar_pickle.diff/sphinx'
=== removed directory '.pc/unversioned_grammar_pickle.diff/sphinx/pycode'
=== removed directory '.pc/unversioned_grammar_pickle.diff/sphinx/pycode/pgen2'
=== removed file '.pc/unversioned_grammar_pickle.diff/sphinx/pycode/pgen2/driver.py'
--- .pc/unversioned_grammar_pickle.diff/sphinx/pycode/pgen2/driver.py	2011-09-28 17:20:22 +0000
+++ .pc/unversioned_grammar_pickle.diff/sphinx/pycode/pgen2/driver.py	1970-01-01 00:00:00 +0000
@@ -1,145 +0,0 @@
-# Copyright 2004-2005 Elemental Security, Inc. All Rights Reserved.
-# Licensed to PSF under a Contributor Agreement.
-
-# Modifications:
-# Copyright 2006 Google, Inc. All Rights Reserved.
-# Licensed to PSF under a Contributor Agreement.
-
-"""Parser driver.
-
-This provides a high-level interface to parse a file into a syntax tree.
-
-"""
-
-__author__ = "Guido van Rossum <[e-mail]>"
-
-__all__ = ["Driver", "load_grammar"]
-
-# Python imports
-import os
-import logging
-import sys
-
-# Pgen imports
-from sphinx.pycode.pgen2 import grammar, parse, token, tokenize, pgen
-
-
-class Driver(object):
-
-    def __init__(self, grammar, convert=None, logger=None):
-        self.grammar = grammar
-        if logger is None:
-            logger = logging.getLogger()
-        self.logger = logger
-        self.convert = convert
-
-    def parse_tokens(self, tokens, debug=False):
-        """Parse a series of tokens and return the syntax tree."""
-        # X X X Move the prefix computation into a wrapper around tokenize.
-        p = parse.Parser(self.grammar, self.convert)
-        p.setup()
-        lineno = 1
-        column = 0
-        type = value = start = end = line_text = None
-        prefix = ""
-        opmap = grammar.opmap
-        for type, value, start, end, line_text in tokens:
-            if start != (lineno, column):
-                assert (lineno, column) <= start, ((lineno, column), start)
-                s_lineno, s_column = start
-                if lineno < s_lineno:
-                    prefix += "\n" * (s_lineno - lineno)
-                    lineno = s_lineno
-                    column = 0
-                if column < s_column:
-                    prefix += line_text[column:s_column]
-                    column = s_column
-            if type in (tokenize.COMMENT, tokenize.NL):
-                prefix += value
-                lineno, column = end
-                if value.endswith("\n"):
-                    lineno += 1
-                    column = 0
-                continue
-            if type == token.OP:
-                type = opmap[value]
-            # if debug:
-            #     self.logger.debug("%s %r (prefix=%r)",
-            #                       token.tok_name[type], value, prefix)
-            if p.addtoken(type, value, (prefix, start)):
-                # if debug:
-                #     self.logger.debug("Stop.")
-                break
-            prefix = ""
-            lineno, column = end
-            if value.endswith("\n"):
-                lineno += 1
-                column = 0
-        else:
-            # We never broke out -- EOF is too soon (how can this happen???)
-            raise parse.ParseError("incomplete input", type, value, line_text)
-        return p.rootnode
-
-    def parse_stream_raw(self, stream, debug=False):
-        """Parse a stream and return the syntax tree."""
-        tokens = tokenize.generate_tokens(stream.readline)
-        return self.parse_tokens(tokens, debug)
-
-    def parse_stream(self, stream, debug=False):
-        """Parse a stream and return the syntax tree."""
-        return self.parse_stream_raw(stream, debug)
-
-    def parse_file(self, filename, debug=False):
-        """Parse a file and return the syntax tree."""
-        stream = open(filename)
-        try:
-            return self.parse_stream(stream, debug)
-        finally:
-            stream.close()
-
-    def parse_string(self, text, debug=False):
-        """Parse a string and return the syntax tree."""
-        tokens = tokenize.generate_tokens(generate_lines(text).next)
-        return self.parse_tokens(tokens, debug)
-
-
-def generate_lines(text):
-    """Generator that behaves like readline without using StringIO."""
-    for line in text.splitlines(True):
-        yield line
-    while True:
-        yield ""
-
-
-def load_grammar(gt="Grammar.txt", gp=None,
-                 save=True, force=False, logger=None):
-    """Load the grammar (maybe from a pickle)."""
-    if logger is None:
-        logger = logging.getLogger()
-    if gp is None:
-        head, tail = os.path.splitext(gt)
-        if tail == ".txt":
-            tail = ""
-        gp = head + tail + ".".join(map(str, sys.version_info[:2])) + ".pickle"
-    if force or not _newer(gp, gt):
-        logger.info("Generating grammar tables from %s", gt)
-        g = pgen.generate_grammar(gt)
-        if save:
-            logger.info("Writing grammar tables to %s", gp)
-            try:
-                g.dump(gp)
-            except IOError, e:
-                logger.info("Writing failed:"+str(e))
-    else:
-        g = grammar.Grammar()
-        g.load(gp)
-    return g
-
-
-def _newer(a, b):
-    """Inquire whether file a was written since file b."""
-    if not os.path.exists(a):
-        return False
-    if not os.path.exists(b):
-        return True
-    return os.path.getmtime(a) >= os.path.getmtime(b)

=== modified file 'CHANGES'
--- CHANGES	2012-02-05 19:33:59 +0000
+++ CHANGES	2012-03-27 21:09:18 +0000
@@ -1,3 +1,61 @@
+Release 1.1.3 (Mar 10, 2012)
+============================
+
+* PR#40: Fix ``safe_repr`` function to decode bytestrings with non-ASCII
+  characters correctly.
+
+* PR#37: Allow configuring sphinx-apidoc via ``SPHINX_APIDOC_OPTIONS``.
+
+* PR#34: Restore Python 2.4 compatibility.
+
+* PR#36: Make the "bibliography to TOC" fix in LaTeX output specific to
+  the document class.
+
+* #695: When the highlight language "python" is specified explicitly,
+  do not try to parse the code to recognize non-Python snippets.
+
+* #859: Fix exception under certain circumstances when not finding
+  appropriate objects to link to.
+
+* #860: Do not crash when encountering invalid doctest examples, just
+  emit a warning.
+
+* #864: Fix crash with some settings of :confval:`modindex_common_prefix`.
+
+* #862: Fix handling of ``-D`` and ``-A`` options on Python 3.
+
+* #851: Recognize and warn about circular toctrees, instead of running
+  into recursion errors.
+
+* #853: Restore compatibility with docutils trunk.
+
+* #852: Fix HtmlHelp index entry links again.
+
+* #854: Fix inheritance_diagram raising attribute errors on builtins.
+
+* #832: Fix crashes when putting comments or lone terms in a glossary.
+
+* #834, #818: Fix HTML help language/encoding mapping for all Sphinx
+  supported languages.
+
+* #844: Fix crashes when dealing with Unicode output in doctest extension.
+
+* #831: Provide ``--project`` flag in setup_command as advertised.
+
+* #875: Fix reading config files under Python 3.
+
+* #876: Fix quickstart test under Python 3.
+
+* #870: Fix spurious KeyErrors when removing documents.
+
+* #892: Fix single-HTML builder misbehaving with the master document in a
+  subdirectory.
+
+* #873: Fix assertion errors with empty ``only`` directives.
+
+* #816: Fix encoding issues in the Qt help builder.
+
+
 Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway!
 ======================================================================
 

=== modified file 'PKG-INFO'
--- PKG-INFO	2012-02-05 19:33:59 +0000
+++ PKG-INFO	2012-03-27 21:09:18 +0000
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
 Name: Sphinx
-Version: 1.1.2
+Version: 1.1.3
 Summary: Python documentation generator
 Home-page: http://sphinx.pocoo.org/
 Author: Georg Brandl

=== modified file 'Sphinx.egg-info/PKG-INFO'
--- Sphinx.egg-info/PKG-INFO	2012-02-05 19:33:59 +0000
+++ Sphinx.egg-info/PKG-INFO	2012-03-27 21:09:18 +0000
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
 Name: Sphinx
-Version: 1.1.2
+Version: 1.1.3
 Summary: Python documentation generator
 Home-page: http://sphinx.pocoo.org/
 Author: Georg Brandl

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-13 12:34:01 +0000
+++ debian/changelog	2012-03-27 21:09:18 +0000
@@ -1,3 +1,55 @@
+sphinx (1.1.3+dfsg-2ubuntu1) precise; urgency=low
+
+  * Merge from Debian Testing. Remaining Ubuntu changes:
+   - Switch to dh_python2.
+   - debian/rules: export NO_PKG_MANGLE=1 in order to
+     not have translations stripped.
+   - debian/control: Drop the dependency on python-whoosh.
+
+ -- Andrew Starr-Bochicchio <[e-mail]>  Tue, 27 Mar 2012 16:25:04 -0400
+
+sphinx (1.1.3+dfsg-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * Add skiptest_latex.diff: if LaTeX (or a required LaTeX package) is not
+    found when running test_build_latex, raise SkipTest instead of just
+    printing a message to stderr.
+
+ -- Jakub Wilk <[e-mail]>  Wed, 14 Mar 2012 20:31:19 +0100
+
+sphinx (1.1.3+dfsg-1) experimental; urgency=low
+
+  * New upstream release.
+    + Drop python3_test_syspath.diff, applied upstream.
+    + Update integration tests for the JavaScript code.
+  * Bump standards version to 3.9.3 (no changes needed).
+
+ -- Jakub Wilk <[e-mail]>  Mon, 12 Mar 2012 12:18:37 +0100
+
+sphinx (1.1.2+dfsg-5) unstable; urgency=low
+
+  * Don't run ‘python setup.py clean’ in the clean target (we nuke the whole
+    build subdirectory anyway).
+  * Move python-all and python-setuptools from Build-Depends to
+    Build-Depends-Indep, as it's not needed in the clean target anymore.
+  * Don't run dh_testroot in the clean target. There's a good chance that root
+    privileges are not needed (e.g. because binary target was run under
+    fakeroot), and even if they are actually needed, the target will fail
+    quickly.
+  * Run tests against Python 3:
+    + Add build-dependency on python3-nose, python3-docutils,
+      python3-pygments, python3-jinja2, python3-sqlalchemy.
+    + Add python3_test_syspath.diff to fix Python 3 sys.path for the test
+      runner.
+    + Add python3_test_build_dir.diff to hardcode Python 3 build directory in
+      the test runner to the one that the package uses.
+    + Add test running code debian/rules. Don't use --no-skip for the moment,
+      as some required packages don't exist yet (see #647441, #647439). Set
+      LC_ALL=C.UTF-8 to work around failures under LC_ALL=C (see
+      <http://deb.li/H8ED> and <http://deb.li/3Rw0z>).
+
+ -- Jakub Wilk <[e-mail]>  Tue, 14 Feb 2012 00:13:35 +0100
+
 sphinx (1.1.2+dfsg-4ubuntu3) precise; urgency=low
 
   * debian/rules: export NO_PKG_MANGLE=1 in order to
@@ -269,7 +321,7 @@
 sphinx (0.6.6-2) unstable; urgency=low
 
   * Team upload.
-   
+
   [ Mikhail Gusarov ]
   * Fix preinst script to correctly remove python-central remnants (Closes:
     #559572).

=== modified file 'debian/control'
--- debian/control	2012-02-21 19:55:03 +0000
+++ debian/control	2012-03-27 21:09:18 +0000
@@ -5,21 +5,23 @@
 XSBC-Original-Maintainer: Jakub Wilk <[e-mail]>
 Uploaders: Debian Python Modules Team <[e-mail]>
 Homepage: http://sphinx.pocoo.org/
-Build-Depends: debhelper (>= 7), python-all (>= 2.5.4-1~), python-setuptools (>= 0.6c5-1~)
-Build-Depends-Indep:
-  python3 (>= 3.1.2-7~), python3-setuptools,
-  python-docutils (>= 0.7),
-  python-pygments (>= 1.2),
-  python-jinja2 (>= 2.3),
-  python-sqlalchemy,
+Build-Depends: debhelper (>= 7)
+Build-Depends-Indep: python-support (>= 0.6.4),
+  python-all (>= 2.5.4-1~), python3 (>= 3.1.2-7~),
+  python-setuptools (>= 0.6c5-1~), python3-setuptools,
+  python-docutils (>= 0.7), python3-docutils (>= 0.7),
+  python-pygments (>= 1.2), python3-pygments (>= 1.2),
+  python-jinja2 (>= 2.3), python3-jinja2 (>= 2.3),
+  python-sqlalchemy, python3-sqlalchemy,
   python-xapian,
-  python-nose, python (>= 2.6.6-14~) | python-simplejson,
+  python-nose, python3-nose,
+  python (>= 2.6.6-14~) | python-simplejson,
   xvfb, xauth, python-webkit, libjs-jquery (>= 1.4), libjs-underscore,
   texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended,
   perl
 XS-Python-Version: >= 2.5
 X-Python3-Version: >= 3.1
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sphinx/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sphinx/trunk/
 

=== modified file 'debian/jstest/run-tests'
--- debian/jstest/run-tests	2012-02-05 19:33:59 +0000
+++ debian/jstest/run-tests	2012-03-27 21:09:18 +0000
@@ -7,14 +7,14 @@
 
 class t1:
     search_term = 'example'
-    n_results = 34
-    n_links = 34
+    n_results = 35
+    n_links = 35
     n_highlights = 32
 
 class t2:
     search_term = 'examples'
-    n_results = 34
-    n_links = 34
+    n_results = 35
+    n_links = 35
     n_highlights = 6
 
 class t3:

=== added file 'debian/patches/python3_test_build_dir.diff'
--- debian/patches/python3_test_build_dir.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/python3_test_build_dir.diff	2012-03-27 21:09:18 +0000
@@ -0,0 +1,23 @@
+Description: Fix build directory for test runner.
+ Hardcode Python 3 build directory in the test runner to the one that Debian
+ package uses.
+Author: Jakub Wilk <[e-mail]>
+Forwarded: not-needed
+Last-Update: 2012-02-12
+
+--- a/tests/run.py
++++ b/tests/run.py
+@@ -14,11 +14,11 @@
+ from os import path, chdir, listdir
+ 
+ if sys.version_info >= (3, 0):
+-    print('Copying and converting sources to build/lib/tests...')
++    print('Copying and converting sources to build/py3/tests...')
+     from distutils.util import copydir_run_2to3
+     testroot = path.dirname(__file__) or '.'
+     newroot = path.join(testroot, path.pardir, 'build')
+-    newroot = path.join(newroot, listdir(newroot)[0], 'tests')
++    newroot = path.join(newroot, 'py3', 'tests')
+     copydir_run_2to3(testroot, newroot)
+     # switch to the converted dir so nose tests the right tests
+     chdir(newroot)

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-02-05 19:33:59 +0000
+++ debian/patches/series	2012-03-27 21:09:18 +0000
@@ -3,3 +3,5 @@
 show_more_stack_frames.diff
 initialize_autodoc.diff
 sphinxcontrib_namespace.diff
+python3_test_build_dir.diff
+skiptest_latex.diff

=== added file 'debian/patches/skiptest_latex.diff'
--- debian/patches/skiptest_latex.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/skiptest_latex.diff	2012-03-27 21:09:18 +0000
@@ -0,0 +1,42 @@
+Description: raise SkipTest if LaTeX (or a required LaTeX package) is not found
+ If LaTeX (or a required LaTeX package) is not found when running
+ test_build_latex, raise SkipTest instead of just printing a message to stderr.
+Author: Jakub Wilk <[e-mail]>
+Bug: https://bitbucket.org/birkenfeld/sphinx/issue/896/test_build_latex-could-use-skiptest
+Forwarded: no
+Last-Update: 2012-03-13
+
+--- a/tests/test_build_latex.py
++++ b/tests/test_build_latex.py
+@@ -18,6 +18,7 @@
+ from sphinx.writers.latex import LaTeXTranslator
+ 
+ from util import *
++from util import SkipTest
+ from test_build_html import ENV_WARNINGS
+ 
+ 
+@@ -68,17 +69,17 @@
+             return True
+ 
+     if kpsetest('article.sty') is None:
+-        print >>sys.stderr, \
+-              'info: not running latex, it doesn\'t seem to be installed'
+-        return
++        raise SkipTest(
++              'not running latex, it doesn\'t seem to be installed'
++        )
+     for filename in ['fancyhdr.sty', 'fancybox.sty', 'titlesec.sty',
+                      'amsmath.sty', 'framed.sty', 'color.sty', 'fancyvrb.sty',
+                      'threeparttable.sty']:
+         if not kpsetest(filename):
+-            print >>sys.stderr, \
+-                  'info: not running latex, the %s package doesn\'t ' \
++            raise SkipTest(
++                  'not running latex, the %s package doesn\'t ' \
+                   'seem to be installed' % filename
+-            return
++            )
+ 
+     # now, try to run latex over it
+     cwd = os.getcwd()

=== modified file 'debian/rules'
--- debian/rules	2012-03-13 12:34:01 +0000
+++ debian/rules	2012-03-27 21:09:18 +0000
@@ -20,6 +20,7 @@
 javascript_path = /usr/share/javascript/sphinxdoc/1.0/
 
 python_all = pyversions -r | tr ' ' '\n' | xargs -t -I {} env {}
+python3_all = py3versions -r | tr ' ' '\n' | xargs -t -I {} env {}
 
 build-arch:
 
@@ -33,18 +34,18 @@
 	rm -rf build/man
 	cp -rl build/html build/man
 	python ./sphinx-build.py -b man doc build/man
+	python setup.py build --build-lib build/py2/
+	python3 setup.py build --build-lib build/py3/
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	$(python_all) tests/run.py --verbose --no-skip
+	export LC_ALL=C.UTF-8 && $(python3_all) tests/run.py --verbose
+	cd build/py3/ && rm -rf tests/ sphinx/pycode/Grammar.pickle
 	xvfb-run ./debian/jstest/run-tests
 endif
-	python setup.py build --build-lib build/py2/
-	python3 setup.py build --build-lib build/py3/
 	touch build-stamp
 
 clean:
 	dh_testdir
-	dh_testroot
-	python setup.py clean
 	find . -name '*.py[co]' -delete
 	rm -rf build
 	rm -f $(basename $(wildcard debian/*.in))

=== modified file 'doc/ext/math.rst'
--- doc/ext/math.rst	2012-02-05 19:33:59 +0000
+++ doc/ext/math.rst	2012-03-27 21:09:18 +0000
@@ -24,6 +24,10 @@
 standard for plain-text math notation and has the added advantage that no
 further translation is necessary when building LaTeX output.
 
+Keep in mind that when you put math markup in **Python docstrings** read by
+:mod:`autodoc <sphinx.ext.autodoc>`, you either have to double all backslashes,
+or use Python raw strings (``r"raw"``).
+
 :mod:`.mathbase` defines these new markup elements:
 
 .. rst:role:: math

=== modified file 'doc/markup/misc.rst'
--- doc/markup/misc.rst	2011-11-20 15:56:50 +0000
+++ doc/markup/misc.rst	2012-03-27 21:09:18 +0000
@@ -182,6 +182,13 @@
    The format of the current builder (``html``, ``latex`` or ``text``) is always
    set as a tag.
 
+   .. note::
+
+      Due to docutils' specifics of parsing of directive content, you cannot put
+      a section with the same level as the main document heading inside an
+      ``only`` directive.  Such sections will appear to be ignored in the parsed
+      document.
+
    .. versionadded:: 0.6
 
 

=== modified file 'setup.cfg'
--- setup.cfg	2011-10-12 00:34:20 +0000
+++ setup.cfg	2012-03-27 21:09:18 +0000
@@ -1,22 +1,22 @@
+[compile_catalog]
+directory = sphinx/locale/
+domain = sphinx
+
+[update_catalog]
+domain = sphinx
+output_dir = sphinx/locale/
+input_file = sphinx/locale/sphinx.pot
+
 [egg_info]
 tag_build = 
 tag_date = 0
 tag_svn_revision = 0
 
-[aliases]
-release = egg_info -RDb ''
-
 [extract_messages]
+keywords = _ l_ lazy_gettext
 mapping_file = babel.cfg
 output_file = sphinx/locale/sphinx.pot
-keywords = _ l_ lazy_gettext
-
-[update_catalog]
-input_file = sphinx/locale/sphinx.pot
-domain = sphinx
-output_dir = sphinx/locale/
-
-[compile_catalog]
-domain = sphinx
-directory = sphinx/locale/
+
+[aliases]
+release = egg_info -RDb ''
 

=== modified file 'setup.py'
--- setup.py	2012-02-05 19:33:59 +0000
+++ setup.py	2012-03-27 21:09:18 +0000
@@ -2,7 +2,6 @@
 try:
     from setuptools import setup, find_packages
 except ImportError:
-    raise
     import distribute_setup
     distribute_setup.use_setuptools()
     from setuptools import setup, find_packages

=== modified file 'sphinx/__init__.py'
--- sphinx/__init__.py	2012-02-05 19:33:59 +0000
+++ sphinx/__init__.py	2012-03-27 21:09:18 +0000
@@ -15,8 +15,8 @@
 import sys
 from os import path
 
-__version__  = '1.1.2'
-__released__ = '1.1.2'  # used when Sphinx builds its own docs
+__version__  = '1.1.3'
+__released__ = '1.1.3'  # used when Sphinx builds its own docs
 
 package_dir = path.abspath(path.dirname(__file__))
 
@@ -35,19 +35,6 @@
     except Exception:
         pass
 
-def _create_sphinext_namespace():
-    # Create namespace package "sphinxcontrib".
-    import pkgutil
-    module_type = type(sys)
-    try:
-        sphinxcontrib = sys.modules['sphinxcontrib']
-    except LookupError:
-        sphinxcontrib = module_type('sphinxcontrib')
-        sphinxcontrib.__path__ = []
-        sys.modules[sphinxcontrib.__name__] = sphinxcontrib
-    sphinxcontrib.__path__ = pkgutil.extend_path(sphinxcontrib.__path__, sphinxcontrib.__name__)
-
-_create_sphinext_namespace()
 
 def main(argv=sys.argv):
     """Sphinx build "main" command-line entry."""

=== modified file 'sphinx/apidoc.py'
--- sphinx/apidoc.py	2011-11-20 15:56:50 +0000
+++ sphinx/apidoc.py	2012-03-27 21:09:18 +0000
@@ -20,12 +20,15 @@
 from os import path
 
 # automodule options
-OPTIONS = [
-    'members',
-    'undoc-members',
-    # 'inherited-members', # disabled because there's a bug in sphinx
-    'show-inheritance',
-]
+if 'SPHINX_APIDOC_OPTIONS' in os.environ:
+    OPTIONS = os.environ['SPHINX_APIDOC_OPTIONS'].split(',')
+else:
+    OPTIONS = [
+        'members',
+        'undoc-members',
+        # 'inherited-members', # disabled because there's a bug in sphinx
+        'show-inheritance',
+    ]
 
 INITPY = '__init__.py'
 

=== modified file 'sphinx/builders/changes.py'
--- sphinx/builders/changes.py	2011-11-20 15:56:50 +0000
+++ sphinx/builders/changes.py	2012-03-27 21:09:18 +0000
@@ -11,7 +11,6 @@
 
 import codecs
 from os import path
-from cgi import escape
 
 from sphinx import package_dir
 from sphinx.util import copy_static_entry
@@ -20,6 +19,7 @@
 from sphinx.builders import Builder
 from sphinx.util.osutil import ensuredir, os_path
 from sphinx.util.console import bold
+from sphinx.util.pycompat import htmlescape
 
 
 class ChangesBuilder(Builder):
@@ -115,7 +115,7 @@
                   '.. deprecated:: %s' % version]
 
         def hl(no, line):
-            line = '<a name="L%s"> </a>' % no + escape(line)
+            line = '<a name="L%s"> </a>' % no + htmlescape(line)
             for x in hltext:
                 if x in line:
                     line = '<span class="hl">%s</span>' % line
@@ -125,7 +125,10 @@
         self.info(bold('copying source files...'))
         for docname in self.env.all_docs:
             f = codecs.open(self.env.doc2path(docname), 'r', 'latin1')
-            lines = f.readlines()
+            try:
+                lines = f.readlines()
+            finally:
+                f.close()
             targetfn = path.join(self.outdir, 'rst', os_path(docname)) + '.html'
             ensuredir(path.dirname(targetfn))
             f = codecs.open(targetfn, 'w', 'latin1')
@@ -148,7 +151,7 @@
                           self.outdir, self)
 
     def hl(self, text, version):
-        text = escape(text)
+        text = htmlescape(text)
         for directive in ['versionchanged', 'versionadded', 'deprecated']:
             text = text.replace('.. %s:: %s' % (directive, version),
                                 '<b>.. %s:: %s</b>' % (directive, version))

=== modified file 'sphinx/builders/html.py'
--- sphinx/builders/html.py	2011-11-20 15:56:50 +0000
+++ sphinx/builders/html.py	2012-03-27 21:09:18 +0000
@@ -698,9 +698,12 @@
         ctx = self.globalcontext.copy()
         # current_page_name is backwards compatibility
         ctx['pagename'] = ctx['current_page_name'] = pagename
+        default_baseuri = self.get_target_uri(pagename)
+        # in the singlehtml builder, default_baseuri still contains an #anchor
+        # part, which relative_uri doesn't really like...
+        default_baseuri = default_baseuri.rsplit('#', 1)[0]
 
-        def pathto(otheruri, resource=False,
-                   baseuri=self.get_target_uri(pagename)):
+        def pathto(otheruri, resource=False, baseuri=default_baseuri):
             if resource and '://' in otheruri:
                 # allow non-local resources given by scheme
                 return otheruri

=== modified file 'sphinx/builders/htmlhelp.py'
--- sphinx/builders/htmlhelp.py	2011-11-20 15:56:50 +0000
+++ sphinx/builders/htmlhelp.py	2012-03-27 21:09:18 +0000
@@ -11,7 +11,6 @@
 """
 
 import os
-import cgi
 import codecs
 from os import path
 
@@ -19,6 +18,7 @@
 
 from sphinx import addnodes
 from sphinx.builders.html import StandaloneHTMLBuilder
+from sphinx.util.pycompat import htmlescape
 
 
 # Project file (*.hhp) template.  'outname' is the file basename (like
@@ -124,20 +124,31 @@
 # See http://msdn.microsoft.com/en-us/library/ms930130.aspx for more.
 chm_locales = {
     # lang:   LCID,  encoding
-    'cs':    (0x405, 'iso8859_2'),
-    'de':    (0x407, 'iso8859_1'),
-    'en':    (0x409, 'iso8859_1'),
-    'es':    (0x40a, 'iso8859_1'),
-    'fi':    (0x40b, 'iso8859_1'),
-    'fr':    (0x40c, 'iso8859_1'),
-    'it':    (0x410, 'iso8859_1'),
+    'ca':    (0x403, 'cp1252'),
+    'cs':    (0x405, 'cp1250'),
+    'da':    (0x406, 'cp1252'),
+    'de':    (0x407, 'cp1252'),
+    'en':    (0x409, 'cp1252'),
+    'es':    (0x40a, 'cp1252'),
+    'et':    (0x425, 'cp1257'),
+    'fa':    (0x429, 'cp1256'),
+    'fi':    (0x40b, 'cp1252'),
+    'fr':    (0x40c, 'cp1252'),
+    'hr':    (0x41a, 'cp1250'),
+    'hu':    (0x40e, 'cp1250'),
+    'it':    (0x410, 'cp1252'),
     'ja':    (0x411, 'cp932'),
+    'ko':    (0x412, 'cp949'),
+    'lt':    (0x427, 'cp1257'),
     'lv':    (0x426, 'cp1257'),
-    'nl':    (0x413, 'iso8859_1'),
-    'pl':    (0x415, 'iso8859_2'),
-    'pt_BR': (0x416, 'iso8859_1'),
+    'nl':    (0x413, 'cp1252'),
+    'pl':    (0x415, 'cp1250'),
+    'pt_BR': (0x416, 'cp1252'),
     'ru':    (0x419, 'cp1251'),
-    'sl':    (0x424, 'iso8859_2'),
+    'sk':    (0x41b, 'cp1250'),
+    'sl':    (0x424, 'cp1250'),
+    'sv':    (0x41d, 'cp1252'),
+    'tr':    (0x41f, 'cp1254'),
     'uk_UA': (0x422, 'cp1251'),
     'zh_CN': (0x804, 'cp936'),
     'zh_TW': (0x404, 'cp950'),
@@ -230,7 +241,7 @@
                         write_toc(subnode, ullevel)
                 elif isinstance(node, nodes.reference):
                     link = node['refuri']
-                    title = cgi.escape(node.astext()).replace('"','&quot;')
+                    title = htmlescape(node.astext()).replace('"','&quot;')
                     f.write(object_sitemap % (title, link))
                 elif isinstance(node, nodes.bullet_list):
                     if ullevel != 0:
@@ -259,20 +270,20 @@
             def write_index(title, refs, subitems):
                 def write_param(name, value):
                     item = '    <param name="%s" value="%s">\n' % \
-                        (name, value[1])
+                        (name, value)
                     f.write(item)
-                title = cgi.escape(title)
+                title = htmlescape(title)
                 f.write('<LI> <OBJECT type="text/sitemap">\n')
                 write_param('Keyword', title)
                 if len(refs) == 0:
                     write_param('See Also', title)
                 elif len(refs) == 1:
-                    write_param('Local', refs[0])
+                    write_param('Local', refs[0][1])
                 else:
                     for i, ref in enumerate(refs):
                         # XXX: better title?
-                        write_param('Name', '[%d] %s' % (i, ref))
-                        write_param('Local', ref)
+                        write_param('Name', '[%d] %s' % (i, ref[1]))
+                        write_param('Local', ref[1])
                 f.write('</OBJECT>\n')
                 if subitems:
                     f.write('<UL> ')

=== modified file 'sphinx/builders/qthelp.py'
--- sphinx/builders/qthelp.py	2011-11-20 15:56:50 +0000
+++ sphinx/builders/qthelp.py	2012-03-27 21:09:18 +0000
@@ -14,12 +14,13 @@
 import codecs
 import posixpath
 from os import path
-from cgi import escape
 
 from docutils import nodes
 
 from sphinx import addnodes
 from sphinx.builders.html import StandaloneHTMLBuilder
+from sphinx.util import force_decode
+from sphinx.util.pycompat import htmlescape
 
 
 _idpattern = re.compile(
@@ -130,16 +131,16 @@
         for indexname, indexcls, content, collapse in self.domain_indices:
             item = section_template % {'title': indexcls.localname,
                                        'ref': '%s.html' % indexname}
-            sections.append((' ' * 4 * 4 + item).encode('utf-8'))
+            sections.append(' ' * 4 * 4 + item)
         # sections may be unicode strings or byte strings, we have to make sure
-        # they are all byte strings before joining them
+        # they are all unicode strings before joining them
         new_sections = []
         for section in sections:
-            if isinstance(section, unicode):
-                new_sections.append(section.encode('utf-8'))
+            if not isinstance(section, unicode):
+                new_sections.append(force_decode(section, None))
             else:
                 new_sections.append(section)
-        sections = u'\n'.encode('utf-8').join(new_sections)
+        sections = u'\n'.join(new_sections)
 
         # keywords
         keywords = []
@@ -147,7 +148,7 @@
         for (key, group) in index:
             for title, (refs, subitems) in group:
                 keywords.extend(self.build_keywords(title, refs, subitems))
-        keywords = '\n'.join(keywords)
+        keywords = u'\n'.join(keywords)
 
         # files
         if not outdir.endswith(os.sep):
@@ -164,7 +165,7 @@
                        fn.endswith('.html'):
                     filename = path.join(root, fn)[olen:]
                     projectfiles.append(file_template %
-                                        {'filename': escape(filename)})
+                                        {'filename': htmlescape(filename)})
         projectfiles = '\n'.join(projectfiles)
 
         # it seems that the "namespace" may not contain non-alphanumeric
@@ -179,12 +180,12 @@
         f = codecs.open(path.join(outdir, outname+'.qhp'), 'w', 'utf-8')
         try:
             f.write(project_template % {
-                'outname': escape(outname),
-                'title': escape(self.config.html_title),
-                'version': escape(self.config.version),
-                'project': escape(self.config.project),
-                'namespace': escape(nspace),
-                'masterdoc': escape(self.config.master_doc),
+                'outname': htmlescape(outname),
+                'title': htmlescape(self.config.html_title),
+                'version': htmlescape(self.config.version),
+                'project': htmlescape(self.config.project),
+                'namespace': htmlescape(nspace),
+                'masterdoc': htmlescape(self.config.master_doc),
                 'sections': sections,
                 'keywords': keywords,
                 'files': projectfiles})
@@ -199,10 +200,10 @@
         f = codecs.open(path.join(outdir, outname+'.qhcp'), 'w', 'utf-8')
         try:
             f.write(collection_template % {
-                'outname': escape(outname),
-                'title': escape(self.config.html_short_title),
-                'homepage': escape(homepage),
-                'startpage': escape(startpage)})
+                'outname': htmlescape(outname),
+                'title': htmlescape(self.config.html_short_title),
+                'homepage': htmlescape(homepage),
+                'startpage': htmlescape(startpage)})
         finally:
             f.close()
 
@@ -220,14 +221,14 @@
         return True
 
     def write_toc(self, node, indentlevel=4):
+        # XXX this should return a Unicode string, not a bytestring
         parts = []
         if self.isdocnode(node):
             refnode = node.children[0][0]
             link = refnode['refuri']
-            title = escape(refnode.astext()).replace('"','&quot;')
-            item = '<section title="%(title)s" ref="%(ref)s">' % {
-                                                                'title': title,
-                                                                'ref': link}
+            title = htmlescape(refnode.astext()).replace('"', '&quot;')
+            item = '<section title="%(title)s" ref="%(ref)s">' % \
+                {'title': title, 'ref': link}
             parts.append(' '*4*indentlevel + item)
             for subnode in node.children[1]:
                 parts.extend(self.write_toc(subnode, indentlevel+1))
@@ -237,7 +238,7 @@
                 parts.extend(self.write_toc(subnode, indentlevel))
         elif isinstance(node, nodes.reference):
             link = node['refuri']
-            title = escape(node.astext()).replace('"','&quot;')
+            title = htmlescape(node.astext()).replace('"','&quot;')
             item = section_template % {'title': title, 'ref': link}
             item = u' ' * 4 * indentlevel + item
             parts.append(item.encode('ascii', 'xmlcharrefreplace'))
@@ -274,7 +275,7 @@
     def build_keywords(self, title, refs, subitems):
         keywords = []
 
-        title = escape(title)
+        title = htmlescape(title)
 #        if len(refs) == 0: # XXX
 #            write_param('See Also', title)
         if len(refs) == 1:

=== modified file 'sphinx/cmdline.py'
--- sphinx/cmdline.py	2012-02-05 19:33:59 +0000
+++ sphinx/cmdline.py	2012-03-27 21:09:18 +0000
@@ -22,7 +22,7 @@
 from sphinx.application import Sphinx
 from sphinx.util import Tee, format_exception_cut_frames, save_traceback
 from sphinx.util.console import red, nocolor, color_terminal
-from sphinx.util.pycompat import terminal_safe
+from sphinx.util.pycompat import terminal_safe, bytes
 
 
 def usage(argv, msg=None):
@@ -137,7 +137,7 @@
             try:
                 val = int(val)
             except ValueError:
-                if likely_encoding:
+                if likely_encoding and isinstance(val, bytes):
                     try:
                         val = val.decode(likely_encoding)
                     except UnicodeError:
@@ -153,7 +153,7 @@
             try:
                 val = int(val)
             except ValueError:
-                if likely_encoding:
+                if likely_encoding and isinstance(val, bytes):
                     try:
                         val = val.decode(likely_encoding)
                     except UnicodeError:
@@ -212,7 +212,7 @@
                 print >>error, terminal_safe(unicode(err))
             else:
                 print >>error, red('Exception occurred:')
-                print >>error, format_exception_cut_frames(10).rstrip()
+                print >>error, format_exception_cut_frames().rstrip()
                 tbpath = save_traceback()
                 print >>error, red('The full traceback has been saved '
                                    'in %s, if you want to report the '

=== modified file 'sphinx/config.py'
--- sphinx/config.py	2012-02-05 19:33:59 +0000
+++ sphinx/config.py	2012-03-27 21:09:18 +0000
@@ -194,8 +194,9 @@
                 # we promise to have the config dir as current dir while the
                 # config file is executed
                 os.chdir(dirname)
-                # get config source
-                f = open(config_file, 'rU')
+                # get config source -- 'b' is a no-op under 2.x, while 'U' is
+                # ignored under 3.x (but 3.x compile() accepts \r\n newlines)
+                f = open(config_file, 'rbU')
                 try:
                     source = f.read()
                 finally:

=== modified file 'sphinx/domains/cpp.py'
--- sphinx/domains/cpp.py	2011-11-20 15:56:50 +0000
+++ sphinx/domains/cpp.py	2012-03-27 21:09:18 +0000
@@ -34,10 +34,10 @@
 _operator_re = re.compile(r'''(?x)
         \[\s*\]
     |   \(\s*\)
-    |   [!<>=/*%+|&^-]=?
     |   \+\+ | --
-    |   (<<|>>)=? | ~ | && | \| | \|\|
     |   ->\*? | \,
+    |   (<<|>>)=? | && | \|\|
+    |   [!<>=/*%+|&^~-]=?
 ''')
 
 _id_shortwords = {

=== modified file 'sphinx/domains/python.py'
--- sphinx/domains/python.py	2011-11-20 15:56:50 +0000
+++ sphinx/domains/python.py	2012-03-27 21:09:18 +0000
@@ -525,7 +525,8 @@
                 # it's a submodule
                 if prev_modname == package:
                     # first submodule - make parent a group head
-                    entries[-1][1] = 1
+                    if entries:
+                        entries[-1][1] = 1
                 elif not prev_modname.startswith(package):
                     # submodule without parent in list, add dummy entry
                     entries.append([stripped + package, 1, '', '', '', '', ''])
@@ -625,22 +626,23 @@
         newname = None
         if searchmode == 1:
             objtypes = self.objtypes_for_role(type)
-            if modname and classname:
-                fullname = modname + '.' + classname + '.' + name
-                if fullname in objects and objects[fullname][1] in objtypes:
-                    newname = fullname
-            if not newname:
-                if modname and modname + '.' + name in objects and \
-                   objects[modname + '.' + name][1] in objtypes:
-                    newname = modname + '.' + name
-                elif name in objects and objects[name][1] in objtypes:
-                    newname = name
-                else:
-                    # "fuzzy" searching mode
-                    searchname = '.' + name
-                    matches = [(oname, objects[oname]) for oname in objects
-                               if oname.endswith(searchname)
-                               and objects[oname][1] in objtypes]
+            if objtypes is not None:
+                if modname and classname:
+                    fullname = modname + '.' + classname + '.' + name
+                    if fullname in objects and objects[fullname][1] in objtypes:
+                        newname = fullname
+                if not newname:
+                    if modname and modname + '.' + name in objects and \
+                       objects[modname + '.' + name][1] in objtypes:
+                        newname = modname + '.' + name
+                    elif name in objects and objects[name][1] in objtypes:
+                        newname = name
+                    else:
+                        # "fuzzy" searching mode
+                        searchname = '.' + name
+                        matches = [(oname, objects[oname]) for oname in objects
+                                   if oname.endswith(searchname)
+                                   and objects[oname][1] in objtypes]
         else:
             # NOTE: searching for exact match, object type is not considered
             if name in objects:

=== modified file 'sphinx/domains/std.py'
--- sphinx/domains/std.py	2011-11-20 15:56:50 +0000
+++ sphinx/domains/std.py	2012-03-27 21:09:18 +0000
@@ -245,6 +245,9 @@
                 continue
             # unindented line -> a term
             if line and not line[0].isspace():
+                # enable comments
+                if line.startswith('.. '):
+                    continue
                 # first term of definition
                 if in_definition:
                     if not was_empty:
@@ -315,7 +318,9 @@
             term += system_messages
 
             defnode = nodes.definition()
-            self.state.nested_parse(definition, definition.items[0][1], defnode)
+            if definition:
+                self.state.nested_parse(definition, definition.items[0][1],
+                                        defnode)
 
             items.append((termtexts,
                           nodes.definition_list_item('', term, defnode)))

=== modified file 'sphinx/environment.py'
--- sphinx/environment.py	2012-02-05 19:33:59 +0000
+++ sphinx/environment.py	2012-03-27 21:09:18 +0000
@@ -1164,7 +1164,12 @@
 
     def get_toc_for(self, docname, builder):
         """Return a TOC nodetree -- for use on the same page only!"""
-        toc = self.tocs[docname].deepcopy()
+        try:
+            toc = self.tocs[docname].deepcopy()
+        except KeyError:
+            # the document does not exist anymore: return a dummy node that
+            # renders to nothing
+            return nodes.paragraph()
         self.process_only_nodes(toc, builder, docname)
         for node in toc.traverse(nodes.reference):
             node['refuri'] = node['anchorname'] or '#'
@@ -1313,12 +1318,14 @@
                             subnode['iscurrent'] = True
                             subnode = subnode.parent
 
-        def _entries_from_toctree(toctreenode, separate=False, subtree=False):
+        def _entries_from_toctree(toctreenode, parents,
+                                  separate=False, subtree=False):
             """Return TOC entries for a toctree node."""
             refs = [(e[0], str(e[1])) for e in toctreenode['entries']]
             entries = []
             for (title, ref) in refs:
                 try:
+                    refdoc = None
                     if url_re.match(ref):
                         reference = nodes.reference('', '', internal=False,
                                                     refuri=ref, anchorname='',
@@ -1341,6 +1348,12 @@
                         # don't show subitems
                         toc = nodes.bullet_list('', item)
                     else:
+                        if ref in parents:
+                            self.warn(ref, 'circular toctree references '
+                                      'detected, ignoring: %s <- %s' %
+                                      (ref, ' <- '.join(parents)))
+                            continue
+                        refdoc = ref
                         toc = self.tocs[ref].deepcopy()
                         self.process_only_nodes(toc, builder, ref)
                         if title and toc.children and len(toc.children) == 1:
@@ -1376,8 +1389,9 @@
                         if not (toctreenode.get('hidden', False)
                                 and not includehidden):
                             i = toctreenode.parent.index(toctreenode) + 1
-                            for item in _entries_from_toctree(toctreenode,
-                                                              subtree=True):
+                            for item in _entries_from_toctree(
+                                    toctreenode, [refdoc] + parents,
+                                    subtree=True):
                                 toctreenode.parent.insert(i, item)
                                 i += 1
                             toctreenode.parent.remove(toctreenode)
@@ -1398,7 +1412,7 @@
         # NOTE: previously, this was separate=True, but that leads to artificial
         # separation when two or more toctree entries form a logical unit, so
         # separating mode is no longer used -- it's kept here for history's sake
-        tocentries = _entries_from_toctree(toctree, separate=False)
+        tocentries = _entries_from_toctree(toctree, [], separate=False)
         if not tocentries:
             return None
 
@@ -1498,19 +1512,21 @@
         self.warn_node(msg % {'target': target}, node)
 
     def process_only_nodes(self, doctree, builder, fromdocname=None):
+        # A comment on the comment() nodes being inserted: replacing by [] would
+        # result in a "Losing ids" exception if there is a target node before
+        # the only node, so we make sure docutils can transfer the id to
+        # something, even if it's just a comment and will lose the id anyway...
         for node in doctree.traverse(addnodes.only):
             try:
                 ret = builder.tags.eval_condition(node['expr'])
             except Exception, err:
                 self.warn_node('exception while evaluating only '
                                'directive expression: %s' % err, node)
-                node.replace_self(node.children)
+                node.replace_self(node.children or nodes.comment())
             else:
                 if ret:
-                    node.replace_self(node.children)
+                    node.replace_self(node.children or nodes.comment())
                 else:
-                    # replacing by [] would result in an "Losing ids" exception
-                    # if there is a target node before the only node
                     node.replace_self(nodes.comment())
 
     def assign_section_numbers(self):
@@ -1686,7 +1702,11 @@
     def collect_relations(self):
         relations = {}
         getinc = self.toctree_includes.get
-        def collect(parents, docname, previous, next):
+        def collect(parents, parents_set, docname, previous, next):
+            # circular relationship?
+            if docname in parents_set:
+                # we will warn about this in resolve_toctree()
+                return
             includes = getinc(docname)
             # previous
             if not previous:
@@ -1723,9 +1743,10 @@
                 for subindex, args in enumerate(izip(includes,
                                                      [None] + includes,
                                                      includes[1:] + [None])):
-                    collect([(docname, subindex)] + parents, *args)
+                    collect([(docname, subindex)] + parents,
+                            parents_set.union([docname]), *args)
             relations[docname] = [parents[0][0], previous, next]
-        collect([(None, 0)], self.config.master_doc, None, None)
+        collect([(None, 0)], set(), self.config.master_doc, None, None)
         return relations
 
     def check_consistency(self):

=== modified file 'sphinx/ext/autodoc.py'
--- sphinx/ext/autodoc.py	2012-02-05 19:33:59 +0000
+++ sphinx/ext/autodoc.py	2012-03-27 21:09:18 +0000
@@ -512,9 +512,13 @@
             # unbound method objects instead of function objects);
             # using keys() because apparently there are objects for which
             # __dict__ changes while getting attributes
-            obj_dict = self.get_attr(self.object, '__dict__')
-            members = [(mname, self.get_attr(self.object, mname, None))
-                       for mname in obj_dict.keys()]
+            try:
+                obj_dict = self.get_attr(self.object, '__dict__')
+            except AttributeError:
+                members = []
+            else:
+                members = [(mname, self.get_attr(self.object, mname, None))
+                           for mname in obj_dict.keys()]
         membernames = set(m[0] for m in members)
         # add instance attributes from the analyzer
         if self.analyzer:

=== modified file 'sphinx/ext/autosummary/generate.py'
--- sphinx/ext/autosummary/generate.py	2012-02-05 19:33:59 +0000
+++ sphinx/ext/autosummary/generate.py	2012-03-27 21:09:18 +0000
@@ -27,7 +27,6 @@
 from jinja2 import FileSystemLoader, TemplateNotFound
 from jinja2.sandbox import SandboxedEnvironment
 
-from sphinx.ext import autodoc
 from sphinx import package_dir
 from sphinx.ext.autosummary import import_by_name, get_documenter
 from sphinx.jinja2glue import BuiltinTemplateLoader
@@ -51,15 +50,6 @@
     if len(args) < 1:
         p.error('no input files given')
 
-    class Sphinx(object):
-        def add_autodocumenter(self, cls):
-            autodoc.add_documenter(cls)
-        def add_event(self, name):
-            pass
-        def add_config_value(self, name, default, rebuild):
-            pass
-    autodoc.setup(Sphinx())
-
     generate_autosummary_docs(args, options.output_dir,
                               "." + options.suffix,
                               template_dir=options.templates)

=== modified file 'sphinx/ext/doctest.py'
--- sphinx/ext/doctest.py	2011-11-20 15:56:50 +0000
+++ sphinx/ext/doctest.py	2012-03-27 21:09:18 +0000
@@ -23,9 +23,11 @@
 from docutils.parsers.rst import directives
 
 from sphinx.builders import Builder
+from sphinx.util import force_decode
 from sphinx.util.nodes import set_source_info
 from sphinx.util.compat import Directive
 from sphinx.util.console import bold
+from sphinx.util.pycompat import bytes
 
 blankline_re = re.compile(r'^\s*<BLANKLINE>', re.MULTILINE)
 doctestopt_re = re.compile(r'#\s*doctest:.+$', re.MULTILINE)
@@ -231,6 +233,8 @@
         self.info(text, nonl=True)
         if self.app.quiet:
             self.warn(text)
+        if isinstance(text, bytes):
+            text = force_decode(text, None)
         self.outfile.write(text)
 
     def get_target_uri(self, docname, typ=None):
@@ -375,8 +379,14 @@
         for code in group.tests:
             if len(code) == 1:
                 # ordinary doctests (code/output interleaved)
-                test = parser.get_doctest(code[0].code, {}, group.name,
-                                          filename, code[0].lineno)
+                try:
+                    test = parser.get_doctest(code[0].code, {}, group.name,
+                                              filename, code[0].lineno)
+                except Exception:
+                    self.warn('ignoring invalid doctest code: %r' %
+                              code[0].code,
+                              '%s:%s' % (filename, code[0].lineno))
+                    continue
                 if not test.examples:
                     continue
                 for example in test.examples:

=== modified file 'sphinx/ext/inheritance_diagram.py'
--- sphinx/ext/inheritance_diagram.py	2011-11-20 15:56:50 +0000
+++ sphinx/ext/inheritance_diagram.py	2012-03-27 21:09:18 +0000
@@ -39,6 +39,7 @@
 import re
 import sys
 import inspect
+import __builtin__
 try:
     from hashlib import md5
 except ImportError:
@@ -142,7 +143,7 @@
         displayed node names.
         """
         all_classes = {}
-        builtins = __builtins__.values()
+        builtins = vars(__builtin__).values()
 
         def recurse(cls):
             if not show_builtins and cls in builtins:

=== modified file 'sphinx/ext/intersphinx.py'
--- sphinx/ext/intersphinx.py	2012-02-05 19:33:59 +0000
+++ sphinx/ext/intersphinx.py	2012-03-27 21:09:18 +0000
@@ -30,6 +30,7 @@
 import urllib2
 import posixpath
 from os import path
+import re
 
 from docutils import nodes
 
@@ -99,7 +100,12 @@
         assert not buf
 
     for line in split_lines(read_chunks()):
-        name, type, prio, location, dispname = line.rstrip().split(None, 4)
+        # be careful to handle names with embedded spaces correctly
+        m = re.match(r'(?x)(.+?)\s+(\S*:\S*)\s+(\S+)\s+(\S+)\s+(.*)',
+                     line.rstrip())
+        if not m:
+            continue
+        name, type, prio, location, dispname = m.groups()
         if location.endswith(u'$'):
             location = location[:-1] + name
         location = join(uri, location)

=== modified file 'sphinx/highlighting.py'
--- sphinx/highlighting.py	2012-02-05 19:33:59 +0000
+++ sphinx/highlighting.py	2012-03-27 21:09:18 +0000
@@ -10,7 +10,6 @@
 """
 
 import sys
-import cgi
 import re
 import textwrap
 
@@ -20,6 +19,7 @@
     # parser is not available on Jython
     parser = None
 
+from sphinx.util.pycompat import htmlescape
 from sphinx.util.texescape import tex_hl_escape_map_new
 from sphinx.ext import doctest
 
@@ -105,7 +105,7 @@
 
     def unhighlighted(self, source):
         if self.dest == 'html':
-            return '<pre>' + cgi.escape(source) + '</pre>\n'
+            return '<pre>' + htmlescape(source) + '</pre>\n'
         else:
             # first, escape highlighting characters like Pygments does
             source = source.translate(escape_hl_chars)
@@ -153,7 +153,7 @@
         else:
             return True
 
-    def highlight_block(self, source, lang, warn=None, **kwargs):
+    def highlight_block(self, source, lang, warn=None, force=False, **kwargs):
         if not isinstance(source, unicode):
             source = source.decode()
         if not pygments:
@@ -164,12 +164,14 @@
             if source.startswith('>>>'):
                 # interactive session
                 lexer = lexers['pycon']
-            else:
+            elif not force:
                 # maybe Python -- try parsing it
                 if self.try_parse(source):
                     lexer = lexers['python']
                 else:
                     return self.unhighlighted(source)
+            else:
+                lexer = lexers['python']
         elif lang in ('python3', 'py3') and source.startswith('>>>'):
             # for py3, recognize interactive sessions, but do not try parsing...
             lexer = lexers['pycon3']

=== modified file 'sphinx/locale/fr/LC_MESSAGES/sphinx.mo'
Binary files sphinx/locale/fr/LC_MESSAGES/sphinx.mo	2012-02-05 19:33:59 +0000 and sphinx/locale/fr/LC_MESSAGES/sphinx.mo	2012-03-27 21:09:18 +0000 differ
=== modified file 'sphinx/locale/fr/LC_MESSAGES/sphinx.po'
--- sphinx/locale/fr/LC_MESSAGES/sphinx.po	2012-02-05 19:33:59 +0000
+++ sphinx/locale/fr/LC_MESSAGES/sphinx.po	2012-03-27 21:09:18 +0000
@@ -303,9 +303,8 @@
 msgstr "%s (module)"
 
 #: sphinx/domains/python.py:491
-#, fuzzy
 msgid "Python Module Index"
-msgstr "Index du module"
+msgstr "Index des modules Python"
 
 #: sphinx/domains/python.py:492
 msgid "modules"
@@ -324,7 +323,6 @@
 msgstr "méthode"
 
 #: sphinx/domains/python.py:564
-#, fuzzy
 msgid "class method"
 msgstr "méthode de classe"
 
@@ -437,9 +435,8 @@
 msgstr ""
 
 #: sphinx/ext/viewcode.py:131
-#, fuzzy
 msgid "Module code"
-msgstr "module"
+msgstr "Code du module"
 
 #: sphinx/ext/viewcode.py:137
 #, python-format
@@ -544,9 +541,8 @@
 msgstr "Go"
 
 #: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20
-#, fuzzy
 msgid "Enter search terms or a module, class or function name."
-msgstr "Saisissez un nom de module, classe ou fonction."
+msgstr "Saisissez un mot clef ou un nom de module, classe ou fonction."
 
 #: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14
 msgid "Show Source"
@@ -673,7 +669,6 @@
 msgstr "Activez le JavaScript pour que la recherche fonctionne."
 
 #: sphinx/themes/basic/search.html:29
-#, fuzzy
 msgid ""
 "From here you can search these documents. Enter your search\n"
 "    words into the box below and click \"search\". Note that the search\n"
@@ -684,7 +679,7 @@
 "termes\n"
 "    de votre recherche dans le champs ci-dessous et cliquez sur "
 "\"rechercher\". Notez que la fonctionnalité de recherche\n"
-"    va automatique chercher pour tous les mots. Les pages\n"
+"    va automatiquement chercher parmi l'ensemble les mots. Les pages\n"
 "    contenant moins de mots n'apparaîtront pas dans la liste des "
 "résultats."
 
@@ -776,7 +771,6 @@
 msgstr "Suite de la page précédente"
 
 #: sphinx/writers/latex.py:681
-#, fuzzy
 msgid "Continued on next page"
 msgstr "Suite sur la page suivante"
 

=== modified file 'sphinx/pycode/pgen2/driver.py'
--- sphinx/pycode/pgen2/driver.py	2011-09-28 17:20:22 +0000
+++ sphinx/pycode/pgen2/driver.py	2012-03-27 21:09:18 +0000
@@ -120,7 +120,7 @@
         head, tail = os.path.splitext(gt)
         if tail == ".txt":
             tail = ""
-        gp = head + tail + ".pickle"
+        gp = head + tail + ".".join(map(str, sys.version_info[:2])) + ".pickle"
     if force or not _newer(gp, gt):
         logger.info("Generating grammar tables from %s", gt)
         g = pgen.generate_grammar(gt)

=== modified file 'sphinx/setup_command.py'
--- sphinx/setup_command.py	2012-02-05 19:33:59 +0000
+++ sphinx/setup_command.py	2012-03-27 21:09:18 +0000
@@ -81,6 +81,7 @@
         self.fresh_env = self.all_files = False
         self.source_dir = self.build_dir = None
         self.builder = 'html'
+        self.project = ''
         self.version = ''
         self.release = ''
         self.today = ''
@@ -125,6 +126,8 @@
         else:
             status_stream = sys.stdout
         confoverrides = {}
+        if self.project:
+             confoverrides['project'] = self.project
         if self.version:
              confoverrides['version'] = self.version
         if self.release:

=== modified file 'sphinx/texinputs/sphinx.sty'
--- sphinx/texinputs/sphinx.sty	2012-02-05 19:33:59 +0000
+++ sphinx/texinputs/sphinx.sty	2012-03-27 21:09:18 +0000
@@ -402,10 +402,15 @@
 }
 
 
-% Fix the index and bibliography environments to add an entry to the Table of
+% Fix the index environment to add an entry to the Table of
 % Contents; this is much nicer than just having to jump to the end of the book
 % and flip around, especially with multiple indexes.
 %
+% A similiar fix must be done to the bibliography environment, although
+% dependant on document class. In particular, the '\addcontentsline' command
+% should use 'chapter' for a report and 'section' for an article.
+% See sphinxmanual.cls and sphinxhowto.cls for specific fixes.
+%
 \let\py@OldTheindex=\theindex
 \renewcommand{\theindex}{
   \cleardoublepage
@@ -414,14 +419,6 @@
   \addcontentsline{toc}{chapter}{\indexname}
 }
 
-\let\py@OldThebibliography=\thebibliography
-\renewcommand{\thebibliography}[1]{
-  \cleardoublepage
-  \phantomsection
-  \py@OldThebibliography{1}
-  \addcontentsline{toc}{chapter}{\bibname}
-}
-
 % Include hyperref last.
 \RequirePackage[colorlinks,breaklinks,
                 linkcolor=InnerLinkColor,filecolor=OuterLinkColor,

=== modified file 'sphinx/texinputs/sphinxhowto.cls'
--- sphinx/texinputs/sphinxhowto.cls	2010-05-25 23:01:44 +0000
+++ sphinx/texinputs/sphinxhowto.cls	2012-03-27 21:09:18 +0000
@@ -79,3 +79,14 @@
 \pagenumbering{arabic}		% ToC & chapters
 
 \thispagestyle{empty}
+
+% Fix the bibliography environment to add an entry to the Table of
+% Contents.
+% For an article document class this environment is a section,
+% so no page break before it.
+\let\py@OldThebibliography=\thebibliography
+\renewcommand{\thebibliography}[1]{
+  \phantomsection
+  \py@OldThebibliography{1}
+  \addcontentsline{toc}{section}{\bibname}
+}

=== modified file 'sphinx/texinputs/sphinxmanual.cls'
--- sphinx/texinputs/sphinxmanual.cls	2010-05-25 23:01:44 +0000
+++ sphinx/texinputs/sphinxmanual.cls	2012-03-27 21:09:18 +0000
@@ -120,3 +120,14 @@
 %
 \renewcommand*\l@section{\@dottedtocline{1}{1.5em}{2.6em}}
 \renewcommand*\l@subsection{\@dottedtocline{2}{4.1em}{3.5em}}
+
+% Fix the bibliography environment to add an entry to the Table of
+% Contents.
+% For a report document class this environment is a chapter.
+\let\py@OldThebibliography=\thebibliography
+\renewcommand{\thebibliography}[1]{
+  \cleardoublepage
+  \phantomsection
+  \py@OldThebibliography{1}
+  \addcontentsline{toc}{chapter}{\bibname}
+}

=== modified file 'sphinx/themes/basic/static/basic.css_t'
--- sphinx/themes/basic/static/basic.css_t	2011-11-20 15:56:50 +0000
+++ sphinx/themes/basic/static/basic.css_t	2012-03-27 21:09:18 +0000
@@ -79,11 +79,11 @@
     font-size: 1em;
 }
 
-div.sphinxsidebar input[type="text"] {
+div.sphinxsidebar #searchbox input[type="text"] {
     width: 170px;
 }
 
-div.sphinxsidebar input[type="submit"] {
+div.sphinxsidebar #searchbox input[type="submit"] {
     width: 30px;
 }
 

=== modified file 'sphinx/util/__init__.py'
--- sphinx/util/__init__.py	2012-02-05 19:33:59 +0000
+++ sphinx/util/__init__.py	2012-03-27 21:09:18 +0000
@@ -28,6 +28,7 @@
 
 import sphinx
 from sphinx.errors import PycodeError
+from sphinx.util.pycompat import bytes
 
 # import other utilities; partly for backwards compatibility, so don't
 # prune unused ones indiscriminately
@@ -310,7 +311,7 @@
 
 def force_decode(string, encoding):
     """Forcibly get a unicode string out of a bytestring."""
-    if isinstance(string, str):
+    if isinstance(string, bytes):
         if encoding:
             string = string.decode(encoding)
         else:

=== modified file 'sphinx/util/inspect.py'
--- sphinx/util/inspect.py	2011-11-20 15:56:50 +0000
+++ sphinx/util/inspect.py	2012-03-27 21:09:18 +0000
@@ -15,6 +15,9 @@
 # relatively import this module
 inspect = __import__('inspect')
 
+from sphinx.util import force_decode
+from sphinx.util.pycompat import bytes
+
 
 if sys.version_info >= (2, 5):
     from functools import partial
@@ -87,4 +90,6 @@
         s = repr(object)
     except Exception:
         raise ValueError
+    if isinstance(s, bytes):
+        return force_decode(s, None).replace('\n', ' ')
     return s.replace('\n', ' ')

=== modified file 'sphinx/util/nodes.py'
--- sphinx/util/nodes.py	2011-11-20 15:56:50 +0000
+++ sphinx/util/nodes.py	2012-03-27 21:09:18 +0000
@@ -179,8 +179,12 @@
         directive.state_machine.get_source_and_line(directive.lineno)
 
 def set_role_source_info(inliner, lineno, node):
+    try:
         node.source, node.line = \
             inliner.reporter.locator(lineno)
+    except AttributeError:
+        # docutils 0.9+
+        node.source, node.line = inliner.reporter.get_source_and_line(lineno)
 
 # monkey-patch Node.__contains__ to get consistent "in" operator behavior
 # across docutils versions

=== modified file 'sphinx/util/osutil.py'
--- sphinx/util/osutil.py	2011-11-20 15:56:50 +0000
+++ sphinx/util/osutil.py	2012-03-27 21:09:18 +0000
@@ -142,4 +142,9 @@
         return path
 
 def find_catalog(docname, compaction):
-    return docname.split(SEP, 1)[0] if compaction else docname
+    if compaction:
+        ret = docname.split(SEP, 1)[0]
+    else:
+        ret = docname
+
+    return ret

=== modified file 'sphinx/util/pycompat.py'
--- sphinx/util/pycompat.py	2011-11-20 15:56:50 +0000
+++ sphinx/util/pycompat.py	2012-03-27 21:09:18 +0000
@@ -64,6 +64,11 @@
         return s.encode('ascii', 'backslashreplace')
 
 
+try:
+    from html import escape as htmlescape
+except ImportError:
+    from cgi import escape as htmlescape
+
 # ------------------------------------------------------------------------------
 # Missing builtins and itertools in Python < 2.6
 

=== modified file 'sphinx/websupport/__init__.py'
--- sphinx/websupport/__init__.py	2011-11-20 15:56:50 +0000
+++ sphinx/websupport/__init__.py	2012-03-27 21:09:18 +0000
@@ -9,7 +9,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-import cgi
 import sys
 import cPickle as pickle
 import posixpath
@@ -22,6 +21,7 @@
 from sphinx.application import Sphinx
 from sphinx.util.osutil import ensuredir
 from sphinx.util.jsonimpl import dumps as dump_json
+from sphinx.util.pycompat import htmlescape
 from sphinx.websupport import errors
 from sphinx.websupport.search import BaseSearch, SEARCH_ADAPTERS
 from sphinx.websupport.storage import StorageBackend
@@ -452,5 +452,5 @@
             ret = publish_parts(text, writer_name='html',
                                 settings_overrides=settings)['fragment']
         except Exception:
-            ret = cgi.escape(text)
+            ret = htmlescape(text)
         return ret

=== modified file 'sphinx/websupport/storage/differ.py'
--- sphinx/websupport/storage/differ.py	2011-11-20 15:56:50 +0000
+++ sphinx/websupport/storage/differ.py	2012-03-27 21:09:18 +0000
@@ -10,9 +10,10 @@
 """
 
 import re
-from cgi import escape
 from difflib import Differ
 
+from sphinx.util.pycompat import htmlescape
+
 
 class CombinedHtmlDiff(object):
     """Create an HTML representation of the differences between two pieces
@@ -21,7 +22,7 @@
     highlight_regex = re.compile(r'([\+\-\^]+)')
 
     def __init__(self, source, proposal):
-        proposal = escape(proposal)
+        proposal = htmlescape(proposal)
 
         differ = Differ()
         self.diff = list(differ.compare(source.splitlines(1),

=== modified file 'sphinx/websupport/storage/sqlalchemy_db.py'
--- sphinx/websupport/storage/sqlalchemy_db.py	2011-11-20 15:56:50 +0000
+++ sphinx/websupport/storage/sqlalchemy_db.py	2012-03-27 21:09:18 +0000
@@ -77,7 +77,10 @@
         comments = []
         list_stack = [comments]
         for r in results:
-            comment, vote = r if username else (r, 0)
+            if username:
+                comment, vote = r
+            else:
+                comment, vote = (r, 0)
 
             inheritance_chain = comment.path.split('.')[1:]
 
@@ -176,7 +179,10 @@
 
         path = self.path.split('.')
         node = path[0]
-        parent = path[-2] if len(path) > 2 else None
+        if len(path) > 2:
+            parent = path[-2]
+        else:
+            parent = None
 
         return {'text': self.text,
                 'username': self.username or 'Anonymous',
@@ -201,8 +207,16 @@
         minutes = seconds / 60
 
         if days == 0:
-            dt = (minutes, 'minute') if hours == 0 else (hours, 'hour')
+            if hours == 0:
+                dt = (minutes, 'minute')
+            else:
+                dt = (hours, 'hour')
         else:
             dt = (days, 'day')
 
-        return '%s %s ago' % dt if dt[0] == 1 else '%s %ss ago' % dt
+        if dt[0] == 1:
+            ret = '%s %s ago' % dt
+        else:
+            ret = '%s %ss ago' % dt
+
+        return ret

=== modified file 'sphinx/writers/html.py'
--- sphinx/writers/html.py	2011-11-20 15:56:50 +0000
+++ sphinx/writers/html.py	2012-03-27 21:09:18 +0000
@@ -65,6 +65,8 @@
             self.permalink_text = self.permalink_text and u'\u00B6' or ''
         self.permalink_text = self.encode(self.permalink_text)
         self.secnumber_suffix = builder.config.html_secnumber_suffix
+        self.param_separator = ''
+        self._table_row_index = 0
 
     def visit_start_of_file(self, node):
         # only occurs in the single-file builder
@@ -233,12 +235,13 @@
         lang = self.highlightlang
         linenos = node.rawsource.count('\n') >= \
                   self.highlightlinenothreshold - 1
+        highlight_args = node.get('highlight_args', {})
         if node.has_key('language'):
             # code-block directives
             lang = node['language']
+            highlight_args['force'] = True
         if node.has_key('linenos'):
             linenos = node['linenos']
-        highlight_args = node.get('highlight_args', {})
         def warner(msg):
             self.builder.warn(msg, (self.builder.current_docname, node.line))
         highlighted = self.highlighter.highlight_block(
@@ -355,6 +358,9 @@
             return
 
         if node.has_key('scale'):
+            # Try to figure out image height and width.  Docutils does that too,
+            # but it tries the final file name, which does not necessarily exist
+            # yet at the time the HTML file is written.
             if Image and not (node.has_key('width')
                               and node.has_key('height')):
                 try:

=== modified file 'sphinx/writers/latex.py'
--- sphinx/writers/latex.py	2011-11-20 15:56:50 +0000
+++ sphinx/writers/latex.py	2012-03-27 21:09:18 +0000
@@ -1299,12 +1299,13 @@
         code = self.verbatim.rstrip('\n')
         lang = self.hlsettingstack[-1][0]
         linenos = code.count('\n') >= self.hlsettingstack[-1][1] - 1
+        highlight_args = node.get('highlight_args', {})
         if 'language' in node:
             # code-block directives
             lang = node['language']
+            highlight_args['force'] = True
         if 'linenos' in node:
             linenos = node['linenos']
-        highlight_args = node.get('highlight_args', {})
         def warner(msg):
             self.builder.warn(msg, (self.curfilestack[-1], node.line))
         hlcode = self.highlighter.highlight_block(code, lang, warn=warner,

=== modified file 'tests/run.py'
--- tests/run.py	2011-11-20 15:56:50 +0000
+++ tests/run.py	2012-03-27 21:09:18 +0000
@@ -22,9 +22,11 @@
     copydir_run_2to3(testroot, newroot)
     # switch to the converted dir so nose tests the right tests
     chdir(newroot)
-
-# always test the sphinx package from this directory
-sys.path.insert(0, path.join(path.dirname(__file__), path.pardir))
+    # always test the sphinx package from build/lib/
+    sys.path.insert(0, path.pardir)
+else:
+    # always test the sphinx package from this directory
+    sys.path.insert(0, path.join(path.dirname(__file__), path.pardir))
 
 try:
     import nose

=== modified file 'tests/test_build_html.py'
--- tests/test_build_html.py	2011-11-20 15:56:50 +0000
+++ tests/test_build_html.py	2012-03-27 21:09:18 +0000
@@ -258,7 +258,7 @@
             r'def'),
         (".//div[@class='inc-tab3 highlight-text']//pre",
             r'-| |-'),
-        (".//div[@class='inc-tab8 highlight-python']//pre",
+        (".//div[@class='inc-tab8 highlight-python']//pre/span",
             r'-|      |-'),
     ])
     HTML_XPATH['subdir/includes.html'].extend([
@@ -328,7 +328,11 @@
     for fname, paths in HTML_XPATH.iteritems():
         parser = NslessParser()
         parser.entity.update(htmlentitydefs.entitydefs)
-        etree = ET.parse(os.path.join(app.outdir, fname), parser)
+        fp = open(os.path.join(app.outdir, fname))
+        try:
+            etree = ET.parse(fp, parser)
+        finally:
+            fp.close()
         for path, check in paths:
             yield check_xpath, etree, fname, path, check
 

=== modified file 'tests/test_intersphinx.py'
--- tests/test_intersphinx.py	2011-11-20 15:56:50 +0000
+++ tests/test_intersphinx.py	2012-03-27 21:09:18 +0000
@@ -43,6 +43,7 @@
 module2 py:module 0 foo.html#module-$ -
 module1.func py:function 1 sub/foo.html#$ -
 CFunc c:function 2 cfunc.html#CFunc -
+a term std:term -1 glossary.html#term-a-term -
 '''.encode('utf-8'))
 
 
@@ -76,6 +77,8 @@
     assert invdata1['py:function']['module1.func'][2] == \
            '/util/sub/foo.html#module1.func'
     assert invdata1['c:function']['CFunc'][2] == '/util/cfunc.html#CFunc'
+    assert invdata1['std:term']['a term'][2] == \
+           '/util/glossary.html#term-a-term'
 
 
 @with_app(confoverrides={'extensions': 'sphinx.ext.intersphinx'})

=== modified file 'tests/test_quickstart.py'
--- tests/test_quickstart.py	2012-02-05 19:33:59 +0000
+++ tests/test_quickstart.py	2012-03-27 21:09:18 +0000
@@ -91,7 +91,7 @@
     conffile = tempdir / 'conf.py'
     assert conffile.isfile()
     ns = {}
-    f = open(conffile, 'U')
+    f = open(conffile, 'rbU')
     try:
         code = compile(f.read(), conffile, 'exec')
     finally:
@@ -151,7 +151,7 @@
     conffile = tempdir / 'source' / 'conf.py'
     assert conffile.isfile()
     ns = {}
-    f = open(conffile, 'U')
+    f = open(conffile, 'rbU')
     try:
         code = compile(f.read(), conffile, 'exec')
     finally: