From 279e5a9afa824690908122208bcdcfa1f2c2d3b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Hejnak=20=28LeHack=29?= Date: Sat, 3 Jun 2017 21:46:49 +0200 Subject: [PATCH 1/2] Fix compilation error when running under Python 3.5 --- container/docker/engine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/docker/engine.py b/container/docker/engine.py index cf26579b..3ac2b89b 100644 --- a/container/docker/engine.py +++ b/container/docker/engine.py @@ -23,7 +23,7 @@ try: import httplib as StatusCodes except ImportError: - from http import HTTPStatus as StatusCodes + import http.client as StatusCodes import container from container import host_only, conductor_only From b1198f567c17f5800f454be29d926f550a5a7edc Mon Sep 17 00:00:00 2001 From: "Joshua \"jag\" Ginsberg" Date: Tue, 27 Feb 2018 12:58:59 -0500 Subject: [PATCH 2/2] Fix http imports for 2.x, <3.5, and >=3.5 h/t @ekohl --- container/docker/engine.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/container/docker/engine.py b/container/docker/engine.py index 3ac2b89b..6ff8fd01 100644 --- a/container/docker/engine.py +++ b/container/docker/engine.py @@ -20,10 +20,13 @@ import sys import tarfile -try: - import httplib as StatusCodes +try: # Python 3.5+ + from http import HTTPStatus as StatusCodes except ImportError: - import http.client as StatusCodes + try: # Python 3 + from http import client as StatusCodes + except ImportError: # Python 2 + import httplib as StatusCodes import container from container import host_only, conductor_only