Merged revisions 58203-58210 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r58204 | georg.brandl | 2007-09-19 08:37:19 +0200 (Wed, 19 Sep 2007) | 2 lines

  Fix #1169: remove docstrings in functions for -OO.
........
  r58206 | sean.reifschneider | 2007-09-19 09:52:56 +0200 (Wed, 19 Sep 2007) | 2 lines

  issue1177: Ported Facundo's from urllib2 to urllib, accepting 2xx responses.
........
  r58207 | facundo.batista | 2007-09-19 16:02:03 +0200 (Wed, 19 Sep 2007) | 3 lines


  Annotated the correction to urllib.py, issue #1177
........
  r58208 | facundo.batista | 2007-09-19 17:10:06 +0200 (Wed, 19 Sep 2007) | 7 lines


  Issue #1772851.  Alters long.__hash__ from being *almost* completely
  predictable to being completely predictable.  The value of hash(n)
  is unchanged for any n that's small enough to be representable as an
  int, and also unchanged for the vast majority of long integers n of
  reasonable size.
........
  r58209 | thomas.wouters | 2007-09-19 19:27:29 +0200 (Wed, 19 Sep 2007) | 4 lines


  Fix obvious typo in threaded test.
........
  r58210 | thomas.wouters | 2007-09-19 19:27:43 +0200 (Wed, 19 Sep 2007) | 4 lines


  Whitespace cleanup.
........
This commit is contained in:
Thomas Wouters 2007-09-19 21:19:28 +00:00
parent 796d0b29e6
commit ce272b6f8a
5 changed files with 44 additions and 25 deletions

View file

@ -357,7 +357,9 @@ class URLopener:
raise IOError('http protocol error', 0,
'got a bad status line', None)
if response.status == 200:
# According to RFC 2616, "2xx" code indicates that the client's
# request was successfully received, understood, and accepted.
if not (200 <= response.status < 300):
return addinfourl(response.fp, response.msg, "http:" + url)
else:
return self.http_error(