# HG changeset patch # User Thomas Arendsen Hein # Date 1146430014 -7200 # Node ID 4564794b6f55939f6d1bd2fbaf3ec68f8c1fb320 # Parent dd4ec4576cc8c72e58921bb35b53ccbd142fdce1 Combine catching exceptions added in dd4ec4576cc8 in one except statement. diff --git a/mercurial/archival.py b/mercurial/archival.py --- a/mercurial/archival.py +++ b/mercurial/archival.py @@ -83,9 +83,7 @@ class zipit: 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