# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1223293896 -7200
# Node ID 582dac23ebacc3ed48a1e5018af5f6476ac433f7
# Parent  efc579fdaf6947d2356a5232d5d902a8b1e47fde# Parent  be2daa324ddfe8558d8dc4eb89b79ee948d2e784
Merge with crew-stable

diff -r efc579fdaf69 -r 582dac23ebac mercurial/localrepo.py
--- a/mercurial/localrepo.py	Sat Oct 04 10:14:39 2008 +0200
+++ b/mercurial/localrepo.py	Mon Oct 06 13:51:36 2008 +0200
@@ -2019,7 +2019,7 @@
             try:
                 name, size = l.split('\0', 1)
                 size = int(size)
-            except ValueError, TypeError:
+            except (ValueError, TypeError):
                 raise util.UnexpectedOutput(
                     _('Unexpected response from remote server:'), l)
             self.ui.debug(_('adding %s (%s)\n') % (name, util.bytecount(size)))