Fully qualify parameters to HTTPConnection/HTTPSConnection

They go in different orders in the two, so fully specify them to make it
super clear.

diff --git a/pgcommitfest/commitfest/ajax.py b/pgcommitfest/commitfest/ajax.py
index baf8470547229cc462ea30be6d456b50c34884d6..35b05e4b9b8f4f817f4439b3a07fbc8674182182 100644 (file)
--- a/pgcommitfest/commitfest/ajax.py
+++ b/pgcommitfest/commitfest/ajax.py
@@ -26,15 +26,15 @@ def _archivesAPI(suburl, params=None):
        try:
                socket.setdefaulttimeout(settings.ARCHIVES_TIMEOUT)
                if settings.ARCHIVES_PORT != 443:
-                       h = httplib.HTTPConnection(settings.ARCHIVES_SERVER,
-                                                                          settings.ARCHIVES_PORT,
-                                                                          True,
-                                                                          settings.ARCHIVES_TIMEOUT)
+                       h = httplib.HTTPConnection(host=settings.ARCHIVES_SERVER,
+                                                                          port=settings.ARCHIVES_PORT,
+                                                                          strict=True,
+                                                                          timeout=settings.ARCHIVES_TIMEOUT)
                else:
-                       h = httplib.HTTPSConnection(settings.ARCHIVES_SERVER,
-                                                                          settings.ARCHIVES_PORT,
-                                                                          True,
-                                                                          settings.ARCHIVES_TIMEOUT)
+                       h = httplib.HTTPSConnection(host=settings.ARCHIVES_SERVER,
+                                                                          port=settings.ARCHIVES_PORT,
+                                                                          strict=True,
+                                                                          timeout=settings.ARCHIVES_TIMEOUT)
                if params:
                        url = "%s?%s" % (suburl, urllib.urlencode(params))
                else:

diff --git a/tools/commitfest/check_patches_in_archives.py b/tools/commitfest/check_patches_in_archives.py
index edea52cdae705f2a76c2052c2ae95af5d5ed5485..b8b29531d91437f5e8899d08c024834f1c2b3942 100755 (executable)
--- a/tools/commitfest/check_patches_in_archives.py
+++ b/tools/commitfest/check_patches_in_archives.py
@@ -49,15 +49,15 @@ if __name__ == "__main__":
                logging.debug("Checking attachment %s" % a.attachmentid)
 
                if settings.ARCHIVES_PORT != 443:
-                       h = httplib.HTTPConnection(settings.ARCHIVES_SERVER,
-                                                                          settings.ARCHIVES_PORT,
-                                                                          True,
-                                                                          settings.ARCHIVES_TIMEOUT)
+                       h = httplib.HTTPConnection(host=settings.ARCHIVES_SERVER,
+                                                                          port=settings.ARCHIVES_PORT,
+                                                                          strict=True,
+                                                                          timeout=settings.ARCHIVES_TIMEOUT)
                else:
-                       h = httplib.HTTPSConnection(settings.ARCHIVES_SERVER,
-                                                                          settings.ARCHIVES_PORT,
-                                                                          True,
-                                                                          settings.ARCHIVES_TIMEOUT)
+                       h = httplib.HTTPSConnection(host=settings.ARCHIVES_SERVER,
+                                                                          port=settings.ARCHIVES_PORT,
+                                                                          strict=True,
+                                                                          timeout=settings.ARCHIVES_TIMEOUT)
                h.request('GET', url, headers={
                        'Host': settings.ARCHIVES_HOST,
                        })