From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 25 Aug 2013 22:33:30 +0000 (+0300)
Subject: #18803: merge with 3.3.
X-Git-Tag: v3.4.0a2~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d640fe2af5095c8104a7cf850c2a669c8e864215;p=python

#18803: merge with 3.3.
---

d640fe2af5095c8104a7cf850c2a669c8e864215
diff --cc Tools/scripts/pathfix.py
index ae1556162b,13ca866a78..22432d1639
--- a/Tools/scripts/pathfix.py
+++ b/Tools/scripts/pathfix.py
@@@ -148,10 -148,10 +148,10 @@@ def fix(filename)
          if atime and mtime:
              try:
                  os.utime(filename, (atime, mtime))
 -            except os.error as msg:
 +            except OSError as msg:
                  err('%s: reset of timestamp failed (%r)\n' % (filename, msg))
                  return 1
-     # Return succes
+     # Return success
      return 0
  
  def fixline(line):