#18803: merge with 3.3.

diff --cc Mac/BuildScript/build-installer.py
Simple merge

diff --cc Parser/asdl_c.py
Simple merge

diff --cc Tools/gdb/libpython.py
Simple merge

diff --cc Tools/scripts/pathfix.py
index ae1556162b0cdf38644a9ae2440d567dec306166,13ca866a78d839c0cda6c5ce86653093d8305232..22432d1639accd93b6ce4201a5b2d31cf5072583
--- 1/Tools/scripts/pathfix.py
--- 2/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):

diff --cc Tools/stringbench/stringbench.py
Simple merge

diff --cc Tools/unicode/makeunicodedata.py
Simple merge