diff --git a/warden3/warden_server/warden_server.py b/warden3/warden_server/warden_server.py index 8a7ad6b0e4ef6dbcc12dffc2d59f23b797db16f6..06639060713e0c558cfab683a3295e4e95c7bcac 100644 --- a/warden3/warden_server/warden_server.py +++ b/warden3/warden_server/warden_server.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright (C) 2011-2015 Cesnet z.s.p.o @@ -8,21 +8,26 @@ from __future__ import print_function import sys import os +from os import path import logging import logging.handlers -import ConfigParser -from traceback import format_tb -import M2Crypto.X509 import json -import MySQLdb as my -import MySQLdb.cursors as mycursors import re import email.utils +from traceback import format_tb from collections import namedtuple from time import sleep -from urlparse import parse_qs -from os import path from random import randint +import M2Crypto.X509 +import MySQLdb as my +import MySQLdb.cursors as mycursors + +if sys.version_info > (3, 0): + import configparser as ConfigParser + from urllib.parse import parse_qs +else: + import ConfigParser + from urlparse import parse_qs # for local version of up to date jsonschema sys.path.append(path.join(path.dirname(__file__), "..", "lib"))