[Python-checkins] merge in cpython: merged

[martin.v.loewis]

martin.v.loewis pushed fd43ce758b11 to cpython:

http://hg.python.org/cpython/rev/fd43ce758b11
changeset:   68051:fd43ce758b11
tag:         tip
parent:      68050:ef10245dfe0c
parent:      68042:8ff33af017ef
user:        Martin v. L?wis <martin at v.loewis.de>
date:        Sat Feb 26 18:45:13 2011 +0100
summary:
  merged

files:
  

diff --git a/Lib/http/client.py b/Lib/http/client.py
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -76,7 +76,7 @@
 import warnings
 
 __all__ = ["HTTPResponse", "HTTPConnection",
-           "HTTPException", "NotConnected", "UnknownProtocol",
+	   "HTTPException", "NotConnected", "UnknownProtocol",
            "UnknownTransferEncoding", "UnimplementedFileMode",
            "IncompleteRead", "InvalidURL", "ImproperConnectionState",
            "CannotSendRequest", "CannotSendHeader", "ResponseNotReady",

--
Repository URL: http://hg.python.org/cpython