Index: mimify.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/mimify.py,v
retrieving revision 1.19
diff -c -r1.19 mimify.py
*** mimify.py	2001/02/10 00:14:18	1.19
--- mimify.py	2001/03/30 10:48:15
***************
*** 448,454 ****
          elif o == '-l':
              try:
                  MAXLEN = int(a)
!             except:
                  print usage
                  sys.exit(1)
          elif o == '-b':
--- 448,454 ----
          elif o == '-l':
              try:
                  MAXLEN = int(a)
!             except ValueError:
                  print usage
                  sys.exit(1)
          elif o == '-b':
Index: posixfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/posixfile.py,v
retrieving revision 1.19
diff -c -r1.19 posixfile.py
*** posixfile.py	2001/02/18 03:30:53	1.19
--- posixfile.py	2001/03/30 10:48:16
***************
*** 92,107 ****
      def dup(self):
          import posix
  
!         try: ignore = posix.fdopen
!         except: raise AttributeError, 'dup() method unavailable'
  
          return posix.fdopen(posix.dup(self._file_.fileno()), self._file_.mode)
  
      def dup2(self, fd):
          import posix
  
!         try: ignore = posix.fdopen
!         except: raise AttributeError, 'dup() method unavailable'
  
          posix.dup2(self._file_.fileno(), fd)
          return posix.fdopen(fd, self._file_.mode)
--- 92,107 ----
      def dup(self):
          import posix
  
!         if not hasattr(posix, 'fdopen'):
!             raise AttributeError, 'dup() method unavailable'
  
          return posix.fdopen(posix.dup(self._file_.fileno()), self._file_.mode)
  
      def dup2(self, fd):
          import posix
  
!         if not hasattr(posix, 'fdopen'):
!             raise AttributeError, 'dup() method unavailable'
  
          posix.dup2(self._file_.fileno(), fd)
          return posix.fdopen(fd, self._file_.mode)
Index: zipfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/zipfile.py,v
retrieving revision 1.10
diff -c -r1.10 zipfile.py
*** zipfile.py	2001/03/29 04:36:08	1.10
--- zipfile.py	2001/03/30 10:48:18
***************
*** 7,13 ****
  
  try:
      import zlib # We may need its compression method
! except:
      zlib = None
  
  __all__ = ["BadZipfile", "error", "ZIP_STORED", "ZIP_DEFLATED", "is_zipfile",
--- 7,13 ----
  
  try:
      import zlib # We may need its compression method
! except ImportError:
      zlib = None
  
  __all__ = ["BadZipfile", "error", "ZIP_STORED", "ZIP_DEFLATED", "is_zipfile",