← Back to branch summary

~jimbaker/pyjuju/debug-relation-hook-context

« back to all changes in this revision

Viewing changes to juju/providers/ec2/utils.py

  • Committer: William Reade
  • Author(s): William Reade
  • Date: 2012-04-11 13:18:42 UTC
  • mfrom: (520.1.3 old-twisted-test-fix)
  • Revision ID: fwereade@gmail.com-20120411131842-2fz6yq5jwwg5ikx8
Tests were not expecting to run against pre-VerifyingContextFactory twisted

R=
CC=
https://codereview.appspot.com/5970089

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/providers/ec2/utils.py
97
97
                return tokens[7]
98
98
        raise LookupError((series, arch, region))
99
99
 
 
100
    uri = _CURRENT_IMAGE_URI_TEMPLATE % (_CURRENT_IMAGE_HOST, series)
100
101
    if ssl and ssl_verify:
101
102
        contextFactory=VerifyingContextFactory(_CURRENT_IMAGE_HOST)
102
103
    else:
103
104
        contextFactory=None
104
 
    d = getPage(_CURRENT_IMAGE_URI_TEMPLATE % (_CURRENT_IMAGE_HOST, series), contextFactory=contextFactory)
 
105
    d = getPage(uri, contextFactory=contextFactory)
105
106
    d.addErrback(handle_404)
106
107
    d.addCallback(extract_ami)
107
108
    return d