From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Fri, 14 Dec 2012 16:02:27 +0000 (+0200)
Subject: Cleanup filecmp: starting from 3.3 os.error is alias for OSError
X-Git-Tag: v3.4.0a1~1859
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22f36eed4d3c01ba101ab77c4df84fae126fc1ac;p=python

Cleanup filecmp: starting from 3.3 os.error is alias for OSError
---

diff --git a/Lib/filecmp.py b/Lib/filecmp.py
index f5cea1de6f..5bbd0e811f 100644
--- a/Lib/filecmp.py
+++ b/Lib/filecmp.py
@@ -147,12 +147,12 @@ class dircmp:
             ok = 1
             try:
                 a_stat = os.stat(a_path)
-            except os.error as why:
+            except OSError as why:
                 # print('Can\'t stat', a_path, ':', why.args[1])
                 ok = 0
             try:
                 b_stat = os.stat(b_path)
-            except os.error as why:
+            except OSError as why:
                 # print('Can\'t stat', b_path, ':', why.args[1])
                 ok = 0
 
@@ -268,7 +268,7 @@ def cmpfiles(a, b, common, shallow=True):
 def _cmp(a, b, sh, abs=abs, cmp=cmp):
     try:
         return not abs(cmp(a, b, sh))
-    except os.error:
+    except OSError:
         return 2