← Back to branch summary

~ubuntu-branches/debian/sid/loggerhead/sid

« back to all changes in this revision

Viewing changes to loggerhead/templatefunctions.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2011-06-02 14:11:55 UTC
  • mto: (13.1.1 experimental)
  • mto: This revision was merged to the branch mainline in revision 15.
  • Revision ID: james.westby@ubuntu.com-20110602141155-1pya25vmwztblmbq
Tags: upstream-1.18.1+bzr447
Import upstream version 1.18.1+bzr447

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templatefunctions.py
127
127
 
128
128
 
129
129
@templatefunc
130
 
def annotate_link(url, revno, path):
 
130
def view_link(url, revno, path):
131
131
    return html_format(
132
132
        '<a href="%s" title="Annotate %s">%s</a>',
133
 
        url(['/annotate', revno, path]), path, path)
 
133
        url(['/view', revno, path]), path, path)
134
134
 
135
135
 
136
136
@templatefunc
194
194
 
195
195
        # TODO: On old Python versions, elementtree may be used.
196
196
 
197
 
        try:
198
 
            import simplejson
199
 
        except ImportError:
200
 
            pass
201
 
        else:
202
 
            versions.append(('simplejson', simplejson.__version__))
 
197
        import simplejson
 
198
        versions.append(('simplejson', simplejson.__version__))
203
199
 
204
200
        try:
205
201
            Dozer = pkg_resources.get_distribution('Dozer')