From a78a90af3323db94bd687b4065294c6a8397ec76 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sun, 20 Oct 2019 10:13:10 +0100
Subject: [PATCH] Minor Python 3 fixes
---
gitlab_docker_autodep/deps.py | 2 +-
gitlab_docker_autodep/main.py | 5 ++++-
gitlab_docker_autodep/server.py | 5 ++++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/gitlab_docker_autodep/deps.py b/gitlab_docker_autodep/deps.py
index 72fea3f..c5ae360 100644
--- a/gitlab_docker_autodep/deps.py
+++ b/gitlab_docker_autodep/deps.py
@@ -65,7 +65,7 @@ def build_dependency_tree(gl, search_pattern=None, filter_pattern=None):
df = _fetch_dockerfile(gl, project, 'master')
if not df:
continue
- base_image = _parse_dockerfile(df)
+ base_image = _parse_dockerfile(df.decode('utf-8'))
if not base_image:
logging.error('ERROR: could not find base image for %s',
project.path_with_namespace)
diff --git a/gitlab_docker_autodep/main.py b/gitlab_docker_autodep/main.py
index 6a22dcb..5c87ea4 100644
--- a/gitlab_docker_autodep/main.py
+++ b/gitlab_docker_autodep/main.py
@@ -2,7 +2,10 @@ import argparse
import logging
import os
import time
-import urlparse
+try:
+ import urlparse
+except ImportError:
+ import urllib.parse as urlparse
from .deps import rebuild_deps
from .server import run_app
diff --git a/gitlab_docker_autodep/server.py b/gitlab_docker_autodep/server.py
index cadb961..3d7b772 100644
--- a/gitlab_docker_autodep/server.py
+++ b/gitlab_docker_autodep/server.py
@@ -1,7 +1,10 @@
import gitlab
-import Queue
import threading
import time
+try:
+ import Queue
+except ImportError:
+ import queue as Queue
from flask import Flask, request, make_response
from .deps import build_dependency_tree, rebuild
--
GitLab