SF patch 1631942 by Collin Winter:

(a) "except E, V" -> "except E as V"
(b) V is now limited to a simple name (local variable)
(c) V is now deleted at the end of the except block

2 files changed, 3 insertions, 3 deletions

diff --git a/Demo/threads/find.py b/Demo/threads/find.py
index 14148b8..68ca155 100644
--- a/Demo/threads/find.py
+++ b/Demo/threads/find.py
@@ -131,7 +131,7 @@ def selector(dir, name, fullname, stat):
 def find(dir, pred, wq):
     try:
         names = os.listdir(dir)
-    except os.error, msg:
+    except os.error as msg:
         print repr(dir), ':', msg
         return
     for name in names:
@@ -139,7 +139,7 @@ def find(dir, pred, wq):
             fullname = os.path.join(dir, name)
             try:
                 stat = os.lstat(fullname)
-            except os.error, msg:
+            except os.error as msg:
                 print repr(fullname), ':', msg
                 continue
             if pred(dir, name, fullname, stat):
diff --git a/Demo/threads/telnet.py b/Demo/threads/telnet.py
index 707a353..09f3bd9 100644
--- a/Demo/threads/telnet.py
+++ b/Demo/threads/telnet.py
@@ -56,7 +56,7 @@ def main():
     #
     try:
         s.connect((host, port))
-    except error, msg:
+    except error as msg:
         sys.stderr.write('connect failed: %r\n' % (msg,))
         sys.exit(1)
     #