Fix imports for python3
The syntax for imports has changed for python3, lets use the new syntax. Change-Id: Ia985424bf23b44e492f51182179d2e476cdcccbb Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
841f120ff6
commit
d892837cad
@ -23,11 +23,11 @@ import time
|
||||
import shlex
|
||||
import sys
|
||||
|
||||
import config as nodepool_config
|
||||
import exceptions
|
||||
import provider_manager
|
||||
import stats
|
||||
import zk
|
||||
from nodepool import config as nodepool_config
|
||||
from nodepool import exceptions
|
||||
from nodepool import provider_manager
|
||||
from nodepool import stats
|
||||
from nodepool import zk
|
||||
|
||||
|
||||
MINS = 60
|
||||
|
@ -17,13 +17,14 @@
|
||||
import logging.config
|
||||
import sys
|
||||
|
||||
from prettytable import PrettyTable
|
||||
|
||||
from nodepool import launcher
|
||||
from nodepool import provider_manager
|
||||
from nodepool import status
|
||||
from nodepool import zk
|
||||
from nodepool.cmd import NodepoolApp
|
||||
from config_validator import ConfigValidator
|
||||
from prettytable import PrettyTable
|
||||
from nodepool.cmd.config_validator import ConfigValidator
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
@ -21,8 +21,8 @@ from six.moves import configparser as ConfigParser
|
||||
import time
|
||||
import yaml
|
||||
|
||||
import fakeprovider
|
||||
import zk
|
||||
from nodepool import fakeprovider
|
||||
from nodepool import zk
|
||||
|
||||
|
||||
class ConfigValue(object):
|
||||
|
@ -21,7 +21,7 @@ import uuid
|
||||
|
||||
import shade
|
||||
|
||||
import exceptions
|
||||
from nodepool import exceptions
|
||||
|
||||
|
||||
class Dummy(object):
|
||||
|
@ -26,13 +26,12 @@ import socket
|
||||
import threading
|
||||
import time
|
||||
|
||||
import exceptions
|
||||
import nodeutils as utils
|
||||
import provider_manager
|
||||
import stats
|
||||
import config as nodepool_config
|
||||
|
||||
import zk
|
||||
from nodepool import exceptions
|
||||
from nodepool import nodeutils as utils
|
||||
from nodepool import provider_manager
|
||||
from nodepool import stats
|
||||
from nodepool import config as nodepool_config
|
||||
from nodepool import zk
|
||||
|
||||
MINS = 60
|
||||
HOURS = 60 * MINS
|
||||
|
@ -25,7 +25,7 @@ import logging
|
||||
|
||||
import paramiko
|
||||
|
||||
import exceptions
|
||||
from nodepool import exceptions
|
||||
|
||||
log = logging.getLogger("nodepool.utils")
|
||||
|
||||
|
@ -21,10 +21,11 @@ from contextlib import contextmanager
|
||||
|
||||
import shade
|
||||
|
||||
import exceptions
|
||||
import fakeprovider
|
||||
from nodeutils import iterate_timeout
|
||||
from task_manager import TaskManager, ManagerStoppedException
|
||||
from nodepool import exceptions
|
||||
from nodepool import fakeprovider
|
||||
from nodepool.nodeutils import iterate_timeout
|
||||
from nodepool.task_manager import ManagerStoppedException
|
||||
from nodepool.task_manager import TaskManager
|
||||
|
||||
|
||||
IPS_LIST_AGE = 5 # How long to keep a cached copy of the ip list
|
||||
|
@ -23,7 +23,7 @@ import logging
|
||||
import time
|
||||
import requests.exceptions
|
||||
|
||||
import stats
|
||||
from nodepool import stats
|
||||
|
||||
class ManagerStoppedException(Exception):
|
||||
pass
|
||||
|
@ -20,7 +20,7 @@ from paste import httpserver
|
||||
import webob
|
||||
from webob import dec
|
||||
|
||||
import status
|
||||
from nodepool import status
|
||||
|
||||
"""Nodepool main web app.
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user