cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Python2.4 fixes

Browse source 
* Ignore accelerate.py
* Don't use a lambda or a ternary
This commit is contained in:
Matt Martz 2015-05-08 16:07:59 -05:00
parent aab13daa6a
commit 7ca732830f
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -7,4 +7,4 @@ addons:
packages: packages:
- python2.4 - python2.4
script: script:
- python2.4 -m compileall -fq -x 'cloud/' . - python2.4 -m compileall -fq -x 'cloud/|/accelerate.py' .

8
packaging/os/apt_repository.py
View file

@ -267,14 +267,18 @@ class SourcesList(object):
def dump(self): def dump(self):
return '\n'.join([str(i) for i in 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): 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. 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. 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:] 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, self._choice(enabled, enabled_old), self._choice(source, source_old), self._choice(comment, comment_old))
self.files[file][n] = (n, valid, choice(enabled, enabled_old), choice(source, source_old), choice(comment, comment_old))
def _add_valid_source(self, source_new, comment_new, file): def _add_valid_source(self, source_new, comment_new, file):
# We'll try to reuse disabled source if we have it. # We'll try to reuse disabled source if we have it.