← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/controllers/changelog_ui.py

  • Committer: Matt Nordhoff
  • Date: 2009-05-02 14:01:05 UTC
  • Revision ID: mnordhoff@mattnordhoff.com-20090502140105-m07dxhtzfgsgu2ia
https://launchpad.net/bugs/370845
Make sure to close mkstemp's file descriptor (bug #370845)

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/controllers/changelog_ui.py
1
1
#
2
 
# Copyright (C) 2008, 2009 Canonical Ltd.
3
2
# Copyright (C) 2006  Robey Pointer <robey@lag.net>
4
3
# Copyright (C) 2006  Goffredo Baroncelli <kreijack@inwind.it>
5
4
#
20
19
 
21
20
import urllib
22
21
 
23
 
import simplejson
 
22
try:
 
23
    import simplejson
 
24
except ImportError:
 
25
    import json as simplejson
24
26
 
25
27
from paste.httpexceptions import HTTPServerError
26
28
 
47
49
 
48
50
        try:
49
51
            revid, start_revid, revid_list = history.get_view(
50
 
                revid, start_revid, filter_file_id, query,
51
 
                extra_rev_count=pagesize+1)
 
52
                revid, start_revid, filter_file_id, query)
52
53
            util.set_context(kwargs)
53
54
 
54
55
            if (query is not None) and (len(revid_list) == 0):
87
88
                self._branch.is_root,
88
89
                'changes'))
89
90
 
90
 
        show_tag_col = False
91
 
        for change in changes:
92
 
            if change.tags is not None:
93
 
                show_tag_col = True
94
 
                break
95
 
 
96
91
        return {
97
92
            'branch': self._branch,
98
93
            'changes': changes,
99
 
            'show_tag_col': show_tag_col,
100
94
            'data': simplejson.dumps(data),
101
95
            'util': util,
102
96
            'history': history,
104
98
            'navigation': navigation,
105
99
            'filter_file_id': filter_file_id,
106
100
            'start_revid': start_revid,
107
 
            'viewing_from': (orig_start_revid is not None) and
 
101
            'viewing_from': (orig_start_revid is not None) and 
108
102
                            (orig_start_revid != history.last_revid),
109
103
            'query': query,
110
104
            'search_failed': search_failed,