From 7ca732830f39946f5318150a9725838702d0d278 Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Fri, 8 May 2015 16:07:59 -0500
Subject: [PATCH] Python2.4 fixes

* Ignore accelerate.py
* Don't use a lambda or a ternary
---
 .travis.yml                    | 2 +-
 packaging/os/apt_repository.py | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 62bbff5cd69..bc19942814c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,4 +7,4 @@ addons:
     packages:
       - python2.4
 script:
-  - python2.4 -m compileall -fq -x 'cloud/' .
+  - python2.4 -m compileall -fq -x 'cloud/|/accelerate.py' .
diff --git a/packaging/os/apt_repository.py b/packaging/os/apt_repository.py
index 2ee5819fc4e..5153699c8bf 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.