← Back to branch summary

~simplestreams-dev/simplestreams/artful

« back to all changes in this revision

Viewing changes to simplestreams/objectstores/swift.py

  • Committer: Scott Moser
  • Date: 2017-09-14 14:38:05 UTC
  • mfrom: (1.1.25)
  • Revision ID: smoser@ubuntu.com-20170914143805-1aaqucihabga3b16
https://launchpad.net/bugs/1577922
https://launchpad.net/bugs/1606606
https://launchpad.net/bugs/1686437
* New upstream snapshot.
  - Keystone v3 Support [David Ames] (LP: #1686437)
  - flake8/pycodestyle updates.
  - tests: change to having http server select its own port
  - Support filters that contain a '-' in the tag name
  - Improvements for running flake8 in different Ubuntu release
    environments.
  - add running of tox.
  - json2streams: Accept items with no size.
  - tools changes (not related to package functionality)
    - tools/ubuntu_versions.py: Exclude old versions by version not name
    - Update default LTS alias to point to Xenial (LP: #1606606)
    - Create chksum for LXD metadata+root for squashfs (LP: #1577922)

Show diffs side-by-side

added added

removed removed

Lines of Context:
simplestreams/objectstores/swift.py
33
33
 
34
34
    connargs = {v: kwargs.get(k) for k, v in nmap.items() if k in kwargs}
35
35
    connargs.update({k: kwargs.get(k) for k in pt if k in kwargs})
36
 
    return Connection(**connargs)
 
36
    if kwargs.get('session'):
 
37
        sess = kwargs.get('session')
 
38
        return Connection(session=sess)
 
39
    else:
 
40
        return Connection(**connargs)
37
41
 
38
42
 
39
43
class SwiftContentSource(cs.IteratorContentSource):