Oh, msg103663 was not the final patch. A more recent version of my patch for #8611 / #9425 is http://codereview.appspot.com/1874048:

 Doc/library/sys.rst         |    6 
 Include/Python.h            |    4 
 Include/fileobject.h        |   20 
 Include/import.h            |   21 
 Include/moduleobject.h      |    1 
 Include/sysmodule.h         |    5 
 Include/warnings.h          |    2 
 Lib/distutils/file_util.py  |    2 
 Lib/platform.py             |   50 +-
 Lib/test/test_import.py     |    7 
 Lib/test/test_sax.py        |    5 
 Lib/test/test_subprocess.py |   14 
 Lib/test/test_sys.py        |    5 
 Lib/test/test_urllib.py     |    8 
 Lib/test/test_urllib2.py    |    5 
 Lib/test/test_xml_etree.py  |    6 
 Modules/getpath.c           |  209 +++++----
 Modules/main.c              |   99 +++-
 Modules/zipimport.c         |  202 +++++----
 Objects/codeobject.c        |   17 
 Objects/fileobject.c        |   32 +
 Objects/moduleobject.c      |   25 -
 Objects/object.c            |    6 
 Objects/typeobject.c        |   12 
 Objects/unicodeobject.c     |   11 
 PC/import_nt.c              |   18 
 Parser/tokenizer.c          |   12 
 Python/_warnings.c          |   69 ++-
 Python/ast.c                |   16 
 Python/bltinmodule.c        |   24 -
 Python/ceval.c              |    7 
 Python/compile.c            |   14 
 Python/errors.c             |    2 
 Python/import.c             |  958 ++++++++++++++++++++++++++------------------
 Python/importdl.c           |   27 -
 Python/importdl.h           |    2 
 Python/pythonrun.c          |  169 +++++++
 Python/sysmodule.c          |   60 ++
 38 files changed, 1404 insertions(+), 748 deletions(-)

So, issue3080-3.patch and issue1874048_1.diff are close :-)