Index: mailcap.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/mailcap.py,v
retrieving revision 1.9
diff -c -r1.9 mailcap.py
*** mailcap.py	2001/02/09 10:23:55	1.9
--- mailcap.py	2001/04/17 15:31:37
***************
*** 20,26 ****
      for mailcap in listmailcapfiles():
          try:
              fp = open(mailcap, 'r')
!         except:
              continue
          morecaps = readmailcapfile(fp)
          fp.close()
--- 20,26 ----
      for mailcap in listmailcapfiles():
          try:
              fp = open(mailcap, 'r')
!         except IOError:
              continue
          morecaps = readmailcapfile(fp)
          fp.close()
Index: mimetools.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/mimetools.py,v
retrieving revision 1.23
diff -c -r1.23 mimetools.py
*** mimetools.py	2001/02/23 20:04:54	1.23
--- mimetools.py	2001/04/17 15:31:38
***************
*** 116,126 ****
          hostid = socket.gethostbyname(socket.gethostname())
          try:
              uid = `os.getuid()`
!         except:
              uid = '1'
          try:
              pid = `os.getpid()`
!         except:
              pid = '1'
          _prefix = hostid + '.' + uid + '.' + pid
      timestamp = '%.3f' % time.time()
--- 116,126 ----
          hostid = socket.gethostbyname(socket.gethostname())
          try:
              uid = `os.getuid()`
!         except AttributeError:
              uid = '1'
          try:
              pid = `os.getpid()`
!         except AttributeError:
              pid = '1'
          _prefix = hostid + '.' + uid + '.' + pid
      timestamp = '%.3f' % time.time()