[Python-checkins] CVS: python/dist/src/Lib os.py,1.50.8.1,1.50.8.2

[Michael Hudson]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv23697

Modified Files:
      Tag: release22-maint
	os.py 
Log Message:
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.


Index: os.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/os.py,v
retrieving revision 1.50.8.1
retrieving revision 1.50.8.2
diff -C2 -d -r1.50.8.1 -r1.50.8.2
*** os.py	7 Mar 2002 10:12:11 -0000	1.50.8.1
--- os.py	16 Mar 2002 18:02:20 -0000	1.50.8.2
***************
*** 602,606 ****
      return (_make_stat_result, args)
  
! _copy_reg.pickle(stat_result, _pickle_stat_result,_make_stat_result)
  
  def _make_statvfs_result(tup, dict):
--- 602,609 ----
      return (_make_stat_result, args)
  
! 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):
***************
*** 611,613 ****
      return (_make_statvfs_result, args)
  
! _copy_reg.pickle(statvfs_result, _pickle_statvfs_result,_make_statvfs_result)
--- 614,620 ----
      return (_make_statvfs_result, args)
  
! try:
!     _copy_reg.pickle(statvfs_result, _pickle_statvfs_result,
!                      _make_statvfs_result)
! except NameError: # statvfs_result may not exist
!     pass