[Zope-Checkins] SVN: Zope/trunk/ - Forward port fix for collector #1548.

[Tres Seaver]

Log message for revision 30780:
   - Forward port fix for collector #1548.

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/ZPublisher/Client.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2005-06-13 01:10:44 UTC (rev 30779)
+++ Zope/trunk/doc/CHANGES.txt	2005-06-13 01:30:38 UTC (rev 30780)
@@ -34,6 +34,8 @@
 
     Bugs fixed
 
+      - Collector #1548: Fix 'httplib' usage in ZPublisher.Client.
+
       - Collector #1792: applied patch for broken ZClasses
 
       - Collector #1803: Fixed InitializeClass for some corner case.

Modified: Zope/trunk/lib/python/ZPublisher/Client.py
===================================================================
--- Zope/trunk/lib/python/ZPublisher/Client.py	2005-06-13 01:10:44 UTC (rev 30779)
+++ Zope/trunk/lib/python/ZPublisher/Client.py	2005-06-13 01:30:38 UTC (rev 30780)
@@ -141,8 +141,7 @@
                 )
 
         try:
-            h=HTTP()
-            h.connect(self.host, self.port)
+            h=HTTP(self.host, self.port)
             h.putrequest(method, self.rurl)
             for hn,hv in headers.items():
                 h.putheader(translate(hn,dashtrans),hv)