diff options
| author | Matt Martz <matt@sivel.net> | 2015-05-08 16:07:59 -0500 |
|---|---|---|
| committer | Marc Abramowitz <marc@marc-abramowitz.com> | 2015-07-04 13:37:59 +0000 |
| commit | e63e846cded9ec8bae749f53929091b7a5b2aae1 (patch) | |
| tree | b769c004eff40340c2da7d2722956c128b040110 | |
| parent | 1749ccd41842d121f891cc7b4dc139b822f7d0bb (diff) | |
| download | ansible-modules-core-e63e846cded9ec8bae749f53929091b7a5b2aae1.tar.gz | |
Python2.4 fixes
* Ignore accelerate.py
* Don't use a lambda or a ternary
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | packaging/os/apt_repository.py | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index d1a48cb7..19698bc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ addons: - python2.4 - python2.6 script: - - python2.4 -m compileall -fq -x 'cloud/|/accelerate.py' . - python2.4 -m compileall -fq cloud/amazon/_ec2_ami_search.py cloud/amazon/ec2_facts.py - python2.6 -m compileall -fq . - python2.7 -m compileall -fq . diff --git a/packaging/os/apt_repository.py b/packaging/os/apt_repository.py index 53e51466..ac586b11 100644 --- a/packaging/os/apt_repository.py +++ b/packaging/os/apt_repository.py @@ -267,14 +267,18 @@ class SourcesList(object): def dump(self): return '\n'.join([str(i) for i in self]) + def _choice(self, new, old): + if new is None: + return old + return new + def modify(self, file, n, enabled=None, source=None, comment=None): ''' This function to be used with iterator, so we don't care of invalid sources. If source, enabled, or comment is None, original value from line ``n`` will be preserved. ''' valid, enabled_old, source_old, comment_old = self.files[file][n][1:] - choice = lambda new, old: old if new is None else new - self.files[file][n] = (n, valid, choice(enabled, enabled_old), choice(source, source_old), choice(comment, comment_old)) + self.files[file][n] = (n, valid, self._choice(enabled, enabled_old), self._choice(source, source_old), self._choice(comment, comment_old)) def _add_valid_source(self, source_new, comment_new, file): # We'll try to reuse disabled source if we have it. |