~bac/charmworld/tag-constraints

« back to all changes in this revision

Viewing changes to charmworld/views/api/__init__.py

  • Committer: Matthew Scott
  • Date: 2014-03-06 20:32:51 UTC
  • mfrom: (489 trunk)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: matthew.scott@canonical.com-20140306203251-ve388tpu1av0coqz
Merge with trunk to resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
44
44
    quote_key,
45
45
    timestamp,
46
46
)
47
 
from charmworld.views.api.proof import proof_deployer
 
47
from charmworld.views.api.proof import proof_deployer_file
48
48
from charmworld.views.utils import (
49
49
    get_bundle_downloads,
50
50
    json_response,
552
552
        path = list(path)
553
553
 
554
554
        if path[0] == 'proof':
555
 
            return proof_deployer(self.request)
 
555
            return proof_deployer_file(self.request)
556
556
 
557
557
        bundle_id, trailing, bundle = self._find_bundle(path)
558
558