diff hgext/largefiles/remotestore.py @ 25660:328739ea70c3

global: mass rewrite to use modern exception syntax

Python 2.6 introduced the "except type as instance" syntax, replacing
the "except type, instance" syntax that came before. Python 3 dropped
support for the latter syntax. Since we no longer support Python 2.4 or
2.5, we have no need to continue supporting the "except type, instance".

This patch mass rewrites the exception syntax to be Python 2.6+ and
Python 3 compatible.

This patch was produced by running `2to3 -f except -w -n .`.

--- a/hgext/largefiles/remotestore.py	Tue Jun 23 22:38:21 2015 -0700
+++ b/hgext/largefiles/remotestore.py	Tue Jun 23 22:20:08 2015 -0700
@@ -38,7 +38,7 @@
         try:
             fd = lfutil.httpsendfile(self.ui, filename)
             return self._put(hash, fd)
-        except IOError, e:
+        except IOError as e:
             raise util.Abort(
                 _('remotestore: could not open file %s: %s')
                 % (filename, str(e)))
@@ -49,17 +49,17 @@
     def _getfile(self, tmpfile, filename, hash):
         try:
             chunks = self._get(hash)
-        except urllib2.HTTPError, e:
+        except urllib2.HTTPError as e:
             # 401s get converted to util.Aborts; everything else is fine being
             # turned into a StoreError
             raise basestore.StoreError(filename, hash, self.url, str(e))
-        except urllib2.URLError, e:
+        except urllib2.URLError as e:
             # This usually indicates a connection problem, so don't
             # keep trying with the other files... they will probably
             # all fail too.
             raise util.Abort('%s: %s' %
                              (util.hidepassword(self.url), e.reason))
-        except IOError, e:
+        except IOError as e:
             raise basestore.StoreError(filename, hash, self.url, str(e))
 
         return lfutil.copyandhash(chunks, tmpfile)