# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1228870972 28800
# Node ID f598df061fec03e360d1adcb51f9da2e981c3ae5
# Parent  90487273f59c7a6242529ecc71793e1414c23cf8# Parent  0a27d0db256d995fb386509ceff3901509e511b4
Merge with crew-stable

diff -r 90487273f59c -r f598df061fec mercurial/ui.py
--- a/mercurial/ui.py	Wed Dec 10 00:29:10 2008 +0100
+++ b/mercurial/ui.py	Tue Dec 09 17:02:52 2008 -0800
@@ -407,7 +407,8 @@
                 import readline
                 # force demandimport to really load the module
                 readline.read_history_file
-            except ImportError:
+                # windows sometimes raises something other than ImportError
+            except Exception:
                 pass
         line = raw_input(prompt)
         # When stdin is in binary mode on Windows, it can cause