Fix

[ 530236 ] os.py assumes existence of statvfs_resul

This was pretty dense of me.  Sorry.

2.2.1 candidate.

diff --git a/Lib/os.py b/Lib/os.py
index f411f1fe09c6a9e511bc6aa6ddfdb754581ec6d6..9d9e059f795f649dbf128b8bd2cb5264b905e41f 100644 (file)
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -612,7 +612,10 @@ def _pickle_stat_result(sr):
     (type, args) = sr.__reduce__()
     return (_make_stat_result, args)
 
-_copy_reg.pickle(stat_result, _pickle_stat_result,_make_stat_result)
+try:
+    _copy_reg.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)
@@ -621,4 +624,8 @@ def _pickle_statvfs_result(sr):
     (type, args) = sr.__reduce__()
     return (_make_statvfs_result, args)
 
-_copy_reg.pickle(statvfs_result, _pickle_statvfs_result,_make_statvfs_result)
+try:
+    _copy_reg.pickle(statvfs_result, _pickle_statvfs_result,
+                     _make_statvfs_result)
+except NameError: # stat_result may not exist
+    pass