Commit f0b11217 authored by David Trudgian's avatar David Trudgian
Browse files

2to3

parent 560a4cde
......@@ -71,11 +71,11 @@ def format_report_text(report):
for feature in features:
if 'Vulnerabilities' in feature:
print "%s - %s" % (feature['Name'], feature['Version'])
print "-" * len(feature['Name'] + ' - ' + feature['Version'])
print("%s - %s" % (feature['Name'], feature['Version']))
print("-" * len(feature['Name'] + ' - ' + feature['Version']))
for vuln in feature['Vulnerabilities']:
print vuln['Name']
print vuln['Link']
print vuln['Description']
print "\n"
print(vuln['Name'])
print(vuln['Link'])
print(vuln['Description'])
print("\n")
......@@ -2,9 +2,9 @@ import click
import shutil
from multiprocessing import Process
from clair import *
from util import sha256
from image import *
from .clair import *
from .util import sha256
from .image import *
@click.command()
......
......@@ -3,8 +3,8 @@ from os import path, chdir
import tempfile
import subprocess
import sys
import SimpleHTTPServer
import SocketServer
import http.server
import socketserver
def check_image(image):
"""Check if specified image file exists"""
......@@ -50,6 +50,6 @@ def http_server(dir, ip, port):
"""
sys.stderr.write("Serving Image to Clair from http://%s:%d\n" % (ip, port))
chdir(dir)
Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
httpd = SocketServer.TCPServer((ip, port), Handler)
Handler = http.server.SimpleHTTPRequestHandler
httpd = socketserver.TCPServer((ip, port), Handler)
httpd.serve_forever()
Markdown is supported
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