Commit ec7c49f2 authored by Luke Plant's avatar Luke Plant
Browse files

Fixed hyperlinking of template tags for Sphinx >= 1.0 

Follow on from incomplete fix in [14477], and [14631] which removed
compatibility for Sphinx < 1.0

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14639 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 58eca97e

docs/_ext/djangodocs.py

+7 −12
Original line number Diff line number Diff line
@@ -233,18 +233,13 @@ class DjangoStandaloneHTMLBuilder(StandaloneHTMLBuilder): 
            self.warn("cannot create templatebuiltins.js due to missing simplejson dependency")

            return

        self.info(bold("writing templatebuiltins.js..."))

        try:

            xrefs = self.env.reftargets.items()

            templatebuiltins = dict([('ttags', [n for ((t,n),(l,a)) in xrefs

                                                if t == 'ttag' and

                                                l == 'ref/templates/builtins']),

                                     ('tfilters', [n for ((t,n),(l,a)) in xrefs

                                                   if t == 'tfilter' and

                                                   l == 'ref/templates/builtins'])])

        except AttributeError:

        xrefs = self.env.domaindata["std"]["objects"]

            templatebuiltins = dict([('ttags', [n for (t,n) in xrefs if t == 'templatetag']),

                                     ('tfilters', [n for (t,n) in xrefs if t == 'templatefilter'])])

        templatebuiltins = dict([('ttags', [n for ((t,n), (l,a)) in xrefs.items()

                                            if t == 'templatetag' and

                                            l == 'ref/templates/builtins' ]),

                                 ('tfilters', [n for ((t,n), (l,a)) in xrefs.items()

                                               if t == 'templatefilter' and

                                               t == 'ref/templates/builtins'])])

        outfilename = os.path.join(self.outdir, "templatebuiltins.js")

        f = open(outfilename, 'wb')

        f.write('var django_template_builtins = ')