open_http also 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 7319bd623fae44160fd4e2ece7bc86eeb343b118..ceacc61303dcc4cbe7a1ba62dd56eacbafbcfb31 100644 (file)
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -276,10 +276,9 @@ class URLopener:
             return addinfourl(fp, headers, "http:" + url)
         else:
             if data is None:
-                return self.http_error(url, fp, errcode, errmsg,
-                                       headers, data)
-            else:
                 return self.http_error(url, fp, errcode, errmsg, headers)
+            else:
+                return self.http_error(url, fp, errcode, errmsg, headers, data)
 
     # Handle http errors.
     # Derived class can override this, or provide specific handlers