[Python-checkins] CVS: python/dist/src/Lib ftplib.py,1.59,1.60

[Guido van Rossum]

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

Modified Files:
	ftplib.py 
Log Message:
Oops.  Catching OverflowError from int() doesn't help, since it raises
ValueError on too-large inputs.


Index: ftplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/ftplib.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** ftplib.py	2001/10/16 19:45:52	1.59
--- ftplib.py	2001/10/17 17:21:47	1.60
***************
*** 509,513 ****
              try:
                  return int(s)
!             except OverflowError:
                  return long(s)
  
--- 509,513 ----
              try:
                  return int(s)
!             except (OverflowError, ValueError):
                  return long(s)
  
***************
*** 559,563 ****
      try:
          return int(s)
!     except OverflowError:
          return long(s)
  
--- 559,563 ----
      try:
          return int(s)
!     except (OverflowError, ValueError):
          return long(s)