http_error had the 'data is None' test backwards. don't call with the

extra argument if data is None.

diff --git a/Lib/urllib.py b/Lib/urllib.py
index 3c8bc0f1e81b1dc70188e630a30c17cf8b577f8c..7319bd623fae44160fd4e2ece7bc86eeb343b118 100644 (file)
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -290,12 +290,11 @@ class URLopener:
         if hasattr(self, name):
             method = getattr(self, name)
             if data is None:
-                result = method(url, fp, errcode, errmsg, headers, data)
-            else:
                 result = method(url, fp, errcode, errmsg, headers)
+            else:
+                result = method(url, fp, errcode, errmsg, headers, data)
             if result: return result
-        return self.http_error_default(
-            url, fp, errcode, errmsg, headers)
+        return self.http_error_default(url, fp, errcode, errmsg, headers)
 
     # Default http error handler: close the connection and raises IOError
     def http_error_default(self, url, fp, errcode, errmsg, headers):