Commit a78a90af authored by ale's avatar ale
Browse files

Minor Python 3 fixes

parent 58567568
...@@ -65,7 +65,7 @@ def build_dependency_tree(gl, search_pattern=None, filter_pattern=None): ...@@ -65,7 +65,7 @@ def build_dependency_tree(gl, search_pattern=None, filter_pattern=None):
df = _fetch_dockerfile(gl, project, 'master') df = _fetch_dockerfile(gl, project, 'master')
if not df: if not df:
continue continue
base_image = _parse_dockerfile(df) base_image = _parse_dockerfile(df.decode('utf-8'))
if not base_image: if not base_image:
logging.error('ERROR: could not find base image for %s', logging.error('ERROR: could not find base image for %s',
project.path_with_namespace) project.path_with_namespace)
......
...@@ -2,7 +2,10 @@ import argparse ...@@ -2,7 +2,10 @@ import argparse
import logging import logging
import os import os
import time import time
import urlparse try:
import urlparse
except ImportError:
import urllib.parse as urlparse
from .deps import rebuild_deps from .deps import rebuild_deps
from .server import run_app from .server import run_app
......
import gitlab import gitlab
import Queue
import threading import threading
import time import time
try:
import Queue
except ImportError:
import queue as Queue
from flask import Flask, request, make_response from flask import Flask, request, make_response
from .deps import build_dependency_tree, rebuild from .deps import build_dependency_tree, rebuild
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment