Merge with crew-stable
authorBrendan Cully <brendan@kublai.com>
Tue, 09 Dec 2008 17:02:52 -0800
changeset 7497 f598df061fec
parent 7495 90487273f59c (current diff)
parent 7496 0a27d0db256d (diff)
child 7501 732c54abd592
Merge with crew-stable
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