# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 2009-12-23 18:18:03
# Node ID 78b8acae2088fca2b459adb7d288c15fec6816d5
# Parent  19c3fefdaec9f0197467610b59b8634d6d9e6773
# Parent  08384d8777a44ff4486c24478673d1c2797c6163

Merge with stable

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -145,8 +145,8 @@ if os.path.isdir('.hg'):
     if version.endswith('+'):
         version += time.strftime('%Y%m%d')
 elif os.path.exists('.hg_archival.txt'):
-    kw = dict([t.strip() for t in l.split(':', 1)]
-              for l in open('.hg_archival.txt'))
+    kw = dict([[t.strip() for t in l.split(':', 1)]
+               for l in open('.hg_archival.txt')])
     if 'tag' in kw:
         version =  kw['tag']
     elif 'latesttag' in kw: