← Back to branch summary

~ubuntu-branches/ubuntu/saucy/cloud-init/saucy

« back to all changes in this revision

Viewing changes to cloudinit/util.py

  • Committer: Package Import Robot
  • Author(s): Scott Moser
  • Date: 2013-05-10 17:53:49 UTC
  • Revision ID: package-import@ubuntu.com-20130510175349-ove5j14j2qx0r7it
* New upstream snapshot.
  * catch up with upstream, which is hopefully 0.7.2
  * straighten out the merging routines
  * fix a bug in Maas datasource

Show diffs side-by-side

added added

removed removed

Lines of Context:
cloudinit/util.py
671
671
 
672
672
 
673
673
def read_file_or_url(url, timeout=5, retries=10,
674
 
                     headers=None, data=None, sec_between=1, ssl_details=None):
 
674
                     headers=None, data=None, sec_between=1, ssl_details=None,
 
675
                     headers_cb=None):
675
676
    url = url.lstrip()
676
677
    if url.startswith("/"):
677
678
        url = "file://%s" % url
685
686
                                  timeout=timeout,
686
687
                                  retries=retries,
687
688
                                  headers=headers,
 
689
                                  headers_cb=headers_cb,
688
690
                                  data=data,
689
691
                                  sec_between=sec_between,
690
692
                                  ssl_details=ssl_details)