diff -r 63a1ee94b3ed Lib/os.py --- a/Lib/os.py Thu Oct 10 00:46:57 2013 -0700 +++ b/Lib/os.py Thu Oct 10 10:06:53 2013 +0200 @@ -945,33 +945,6 @@ otherwise return -SIG, where SIG is the __all__.extend(["spawnlp", "spawnlpe"]) -import copyreg as _copyreg - -def _make_stat_result(tup, dict): - return stat_result(tup, dict) - -def _pickle_stat_result(sr): - (type, args) = sr.__reduce__() - return (_make_stat_result, args) - -try: - _copyreg.pickle(stat_result, _pickle_stat_result, _make_stat_result) -except NameError: # stat_result may not exist - pass - -def _make_statvfs_result(tup, dict): - return statvfs_result(tup, dict) - -def _pickle_statvfs_result(sr): - (type, args) = sr.__reduce__() - return (_make_statvfs_result, args) - -try: - _copyreg.pickle(statvfs_result, _pickle_statvfs_result, - _make_statvfs_result) -except NameError: # statvfs_result may not exist - pass - # Supply os.popen() def popen(cmd, mode="r", buffering=-1): if not isinstance(cmd, str): diff -r 63a1ee94b3ed Modules/posixmodule.c --- a/Modules/posixmodule.c Thu Oct 10 00:46:57 2013 -0700 +++ b/Modules/posixmodule.c Thu Oct 10 10:06:53 2013 +0200 @@ -11974,7 +11974,7 @@ INITFUNC(void) return NULL; #endif - stat_result_desc.name = MODNAME ".stat_result"; + stat_result_desc.name = "os.stat_result"; stat_result_desc.fields[7].name = PyStructSequence_UnnamedField; stat_result_desc.fields[8].name = PyStructSequence_UnnamedField; stat_result_desc.fields[9].name = PyStructSequence_UnnamedField; @@ -11983,7 +11983,7 @@ INITFUNC(void) structseq_new = StatResultType.tp_new; StatResultType.tp_new = statresult_new; - statvfs_result_desc.name = MODNAME ".statvfs_result"; + statvfs_result_desc.name = "os.statvfs_result"; if (PyStructSequence_InitType2(&StatVFSResultType, &statvfs_result_desc) < 0) return NULL;