[Python-checkins] CVS: distutils/distutils core.py,1.41,1.42

[Greg Ward]

Update of /cvsroot/python/distutils/distutils
In directory slayer.i.sourceforge.net:/tmp/cvs-serv27893

Modified Files:
	core.py 
Log Message:
Changed to use the new 'grok_environment_error()' function instead of 
muddling through IOError and OSError exception objects right here.

Index: core.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/core.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** core.py	2000/06/03 01:02:06	1.41
--- core.py	2000/06/17 02:17:45	1.42
***************
*** 113,126 ****
              raise SystemExit, "interrupted"
          except (IOError, os.error), exc:
!             # check for Python 1.5.2-style {IO,OS}Error exception objects
!             if hasattr (exc, 'filename') and hasattr (exc, 'strerror'):
!                 if exc.filename:
!                     error = "error: %s: %s" % (exc.filename, exc.strerror)
!                 else:
!                     # two-argument functions in posix module don't
!                     # include the filename in the exception object!
!                     error = "error: %s" % exc.strerror
!             else:
!                 error = "error: " + str(exc[-1])
  
              if DEBUG:
--- 113,117 ----
              raise SystemExit, "interrupted"
          except (IOError, os.error), exc:
!             error = grok_environment_error(exc)
  
              if DEBUG: