From 7b54548c37a9cfccef8381308201418386e65bf9 Mon Sep 17 00:00:00 2001
From: mfrasca <>
Date: Mon, 30 Oct 2006 10:31:35 +0000
Subject: [PATCH] 1587104: error initializing font 3x5

'and' is not 'and_then'...
split a test in two parts:
if elem[c] and d2[c]... into
if elem[c] then if d2[c]...
---
 wmdocklib/pywmhelpers.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wmdocklib/pywmhelpers.py b/wmdocklib/pywmhelpers.py
index 9d32136..beb304f 100644
--- a/wmdocklib/pywmhelpers.py
+++ b/wmdocklib/pywmhelpers.py
@@ -277,8 +277,10 @@ def initPixmap(background=None,
         width, height = [int(item) for item in m.groups()]
 
         replace = []
-        for code, value in font_palette.items():
-            if not available[code] and palette[code] != font_palette[code]:
+        for code, value in [(code, value)
+                            for (code, value) in font_palette.items()
+                            if not available[code]]:
+            if palette[code] != font_palette[code]:
                 newcode = [k for k in available if available[k]][0]
                 available[newcode] = False
                 replace.append((code, newcode))