backport my checkin of

    revision 1.54 of os.py

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 6ffd9cb787f6160581b85d9d355dada5a860a714..2a5210fc8c1ecdc4252684a540c87c9a088331f3 100644 (file)
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -601,7 +601,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)
@@ -610,4 +613,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: # statvfs_result may not exist
+    pass