$ diffstat ~/surrogates-7.patch
 Doc/library/tarfile.rst     |   15 +--
 Include/moduleobject.h      |    1
 Lib/platform.py             |   12 +-
 Lib/subprocess.py           |    2
 Lib/tarfile.py              |   14 --
 Lib/test/regrtest.py        |    5 -
 Lib/test/test_import.py     |    5 +
 Lib/test/test_reprlib.py    |    4
 Lib/test/test_subprocess.py |    4
 Lib/test/test_tarfile.py    |    4
 Lib/test/test_urllib.py     |    8 +
 Lib/test/test_urllib2.py    |    4
 Lib/test/test_xml_etree.py  |    6 +
 Lib/traceback.py            |   10 +-
 Lib/unittest/runner.py      |    4
 Modules/_ctypes/callproc.c  |   12 +-
 Modules/_ssl.c              |   10 +-
 Modules/_tkinter.c          |    6 -
 Modules/getpath.c           |  100 ++++++++++++++++++--
 Modules/main.c              |   46 +++++----
 Modules/posixmodule.c       |   18 ++-
 Modules/pyexpat.c           |   11 +-
 Modules/zipimport.c         |  210 ++++++++++++++++++++++++++++++++------------
 Objects/codeobject.c        |    7 +
 Objects/exceptions.c        |   49 ++++++----
 Objects/fileobject.c        |    6 -
 Objects/moduleobject.c      |   22 +++-
 Objects/unicodeobject.c     |   22 +++-
 Parser/tokenizer.c          |   18 ++-
 Python/_warnings.c          |   26 ++++-
 Python/ast.c                |   10 +-
 Python/bltinmodule.c        |   33 ++++--
 Python/ceval.c              |    4
 Python/compile.c            |   12 ++
 Python/errors.c             |    4
 Python/import.c             |   88 ++++++++++++------
 Python/pythonrun.c          |   39 ++++----
 Python/traceback.c          |   39 ++++++--
 38 files changed, 625 insertions(+), 265 deletions(-)