← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/templatefunctions.py

  • Committer: John Arbash Meinel
  • Date: 2011-03-16 11:40:05 UTC
  • mfrom: (434 trunk-rich)
  • mto: This revision was merged to the branch mainline in revision 435.
  • Revision ID: john@arbash-meinel.com-20110316114005-1rdrmdu9hda30xak
Merge trunk to resolve text conflict in deleting setup_logging

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templatefunctions.py
121
121
 
122
122
 
123
123
@templatefunc
124
 
def annotate_link(url, revno, path):
 
124
def view_link(url, revno, path):
125
125
    return '<a href="%s" title="Annotate %s">%s</a>' % (
126
 
        url(['/annotate', revno, path]), cgi.escape(path), cgi.escape(path))
 
126
        url(['/view', revno, path]), cgi.escape(path), cgi.escape(path))
127
127
 
128
128
@templatefunc
129
129
def revision_link(url, revno, path, frag=''):
186
186
 
187
187
        # TODO: On old Python versions, elementtree may be used.
188
188
 
189
 
        try:
190
 
            import simplejson
191
 
        except ImportError:
192
 
            pass
193
 
        else:
194
 
            versions.append(('simplejson', simplejson.__version__))
 
189
        import simplejson
 
190
        versions.append(('simplejson', simplejson.__version__))
195
191
 
196
192
        try:
197
193
            Dozer = pkg_resources.get_distribution('Dozer')