From ae182d3466028a7570cce7655c73f0e0e2c4b468 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Sat, 7 Jan 2017 14:19:01 +0100 Subject: [PATCH] Fully qualify parameters to HTTPConnection/HTTPSConnection They go in different orders in the two, so fully specify them to make it super clear. --- pgcommitfest/commitfest/ajax.py | 16 ++++++++-------- tools/commitfest/check_patches_in_archives.py | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pgcommitfest/commitfest/ajax.py b/pgcommitfest/commitfest/ajax.py index baf8470..35b05e4 100644 --- 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 edea52c..b8b2953 100755 --- 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, }) -- 2.39.5