[Python-3000-checkins] r58703 - in python/branches/py3k-pep3137: Lib/urllib2.py

[guido.van.rossum]

Author: guido.van.rossum
Date: Mon Oct 29 18:07:19 2007
New Revision: 58703

Modified:
   python/branches/py3k-pep3137/   (props changed)
   python/branches/py3k-pep3137/Lib/urllib2.py
Log:
Merged revisions 58694-58702 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r58694 | neal.norwitz | 2007-10-27 10:25:12 -0700 (Sat, 27 Oct 2007) | 3 lines
  
  URLError now takes only a single parameter.  This was causing 
  errors in test_urllib2net on the MIPS buildbot.
........
  r58701 | guido.van.rossum | 2007-10-29 09:42:51 -0700 (Mon, 29 Oct 2007) | 5 lines
  
  Issue 1340 by Amaury Forgeot d'Arc (with help from Christian Heimes,
  and my own interpretation).
  Don't pass the newline= flag to StringIO in SpooledTemporaryFile.
  This avoids doubling newlines when the file is rolled over.
........
  r58702 | fred.drake | 2007-10-29 09:56:50 -0700 (Mon, 29 Oct 2007) | 1 line
  
  fix typo
........


Modified: python/branches/py3k-pep3137/Lib/urllib2.py
==============================================================================
--- python/branches/py3k-pep3137/Lib/urllib2.py	(original)
+++ python/branches/py3k-pep3137/Lib/urllib2.py	Mon Oct 29 18:07:19 2007
@@ -1240,7 +1240,7 @@
         import mimetypes
         host = req.get_host()
         if not host:
-            raise URLError('ftp error', 'no host given')
+            raise URLError('ftp error: no host given')
         host, port = splitport(host)
         if port is None:
             port = ftplib.FTP_PORT
@@ -1286,7 +1286,7 @@
             headers = mimetools.Message(sf)
             return addinfourl(fp, headers, req.get_full_url())
         except ftplib.all_errors as msg:
-            raise URLError('ftp error', msg).with_traceback(sys.exc_info()[2])
+            raise URLError('ftp error %s' % msg).with_traceback(sys.exc_info()[2])
 
     def connect_ftp(self, user, passwd, host, port, dirs, timeout):
         fw = ftpwrapper(user, passwd, host, port, dirs, timeout)