# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1146430014 -7200
# Node ID 4564794b6f55939f6d1bd2fbaf3ec68f8c1fb320
# Parent  dd4ec4576cc8c72e58921bb35b53ccbd142fdce1
Combine catching exceptions added in dd4ec4576cc8 in one except statement.


diff -r dd4ec4576cc8 -r 4564794b6f55 mercurial/archival.py
--- a/mercurial/archival.py	Sun Apr 30 22:43:41 2006 +0200
+++ b/mercurial/archival.py	Sun Apr 30 22:46:54 2006 +0200
@@ -83,9 +83,7 @@
         if not isinstance(dest, str):
             try:
                 dest.tell()
-            except AttributeError:
-                dest = tellable(dest)
-            except IOError:
+            except (AttributeError, IOError):
                 dest = tellable(dest)
         self.z = zipfile.ZipFile(dest, 'w',
                                  compress and zipfile.ZIP_DEFLATED or