Skip to content

Commit

Permalink
Avoid circular imports when calling salt.utils functions (#34586)
Browse files Browse the repository at this point in the history
Also remove unused imports:
  - platform
  - hashlib.md5
  - salt.utils.process.MultiprocessingProcess
  - tornado.concurrent
  • Loading branch information
Nicole Thomas committed Jul 12, 2016
1 parent 81d5a7a commit 3576493
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions tests/integration/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

# Import Python libs
from __future__ import absolute_import, print_function
import platform
import os
import re
import sys
Expand All @@ -25,7 +24,6 @@
import threading
import subprocess
import multiprocessing
from hashlib import md5
from datetime import datetime, timedelta
try:
import pwd
Expand Down Expand Up @@ -62,10 +60,9 @@
import salt.utils
import salt.utils.process
import salt.log.setup as salt_log_setup
from salt.utils import fopen, get_colors
from salt.utils.verify import verify_env
from salt.utils.immutabletypes import freeze
from salt.utils.process import MultiprocessingProcess, SignalHandlingMultiprocessingProcess
from salt.utils.process import SignalHandlingMultiprocessingProcess
from salt.utils.nb_popen import NonBlockingPopen
from salt.exceptions import SaltClientError

Expand All @@ -91,7 +88,6 @@
HAS_PSUTIL = False
from tornado import gen
from tornado import ioloop
from tornado import concurrent


SYS_TMP_DIR = os.path.realpath(
Expand Down Expand Up @@ -628,7 +624,7 @@ class TestDaemon(object):

def __init__(self, parser):
self.parser = parser
self.colors = get_colors(self.parser.options.no_colors is False)
self.colors = salt.utils.get_colors(self.parser.options.no_colors is False)
if salt.utils.is_windows():
# There's no shell color support on windows...
for key in self.colors:
Expand Down

0 comments on commit 3576493

Please sign in to comment.