comparison mercurial/archival.py @ 2169:4564794b6f55

Combine catching exceptions added in dd4ec4576cc8 in one except statement.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 30 Apr 2006 22:46:54 +0200
parents dd4ec4576cc8
children 0c0bfea3f72a
comparison
equal deleted inserted replaced
2168:dd4ec4576cc8 2169:4564794b6f55
81 def __init__(self, dest, prefix, compress=True): 81 def __init__(self, dest, prefix, compress=True):
82 self.prefix = tidyprefix(dest, prefix, ('.zip',)) 82 self.prefix = tidyprefix(dest, prefix, ('.zip',))
83 if not isinstance(dest, str): 83 if not isinstance(dest, str):
84 try: 84 try:
85 dest.tell() 85 dest.tell()
86 except AttributeError: 86 except (AttributeError, IOError):
87 dest = tellable(dest)
88 except IOError:
89 dest = tellable(dest) 87 dest = tellable(dest)
90 self.z = zipfile.ZipFile(dest, 'w', 88 self.z = zipfile.ZipFile(dest, 'w',
91 compress and zipfile.ZIP_DEFLATED or 89 compress and zipfile.ZIP_DEFLATED or
92 zipfile.ZIP_STORED) 90 zipfile.ZIP_STORED)
93 self.date_time = time.gmtime(time.time())[:6] 91 self.date_time = time.gmtime(time.time())[:6]