# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2010-12-16 20:50:36
# Node ID 07d08c130892aa0ecac9894d6dbb1027d79b64b3
# Parent  3172da69ff37832cad53f86a625f9fdc3056d0f1

check-code: catch "except as"

diff --git a/contrib/check-code.py b/contrib/check-code.py
--- a/contrib/check-code.py
+++ b/contrib/check-code.py
@@ -129,6 +129,7 @@ pypats = [
     (r'[\x80-\xff]', "non-ASCII character literal"),
     (r'("\')\.format\(', "str.format() not available in Python 2.4"),
     (r'^\s*with\s+', "with not available in Python 2.4"),
+    (r'^\s*except.* as .*:', "except as not available in Python 2.4"),
     (r'(?<!def)\s+(any|all|format)\(',
      "any/all/format not available in Python 2.4"),
     (r'(?<!def)\s+(callable)\(',
diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -21,7 +21,7 @@ def substate(ctx):
             for l in ctx['.hgsubstate'].data().splitlines():
                 revision, path = l.split(" ", 1)
                 rev[path] = revision
-        except IOError as err:
+        except IOError, err:
             if err.errno != errno.ENOENT:
                 raise
     return rev