Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2016.3] Avoid salt.utils circular imports when using "from" #34585

Merged
merged 1 commit into from
Jul 12, 2016
Merged

[2016.3] Avoid salt.utils circular imports when using "from" #34585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions tests/integration/__init__.py
View file
Open in desktop
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 Down Expand Up @@ -58,7 +57,6 @@
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
Expand Down Expand Up @@ -178,7 +176,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)

def __enter__(self):
'''
Expand Down Expand Up @@ -737,7 +735,7 @@ def setup_minions(self):
if self.parser.options.clean is False:
def sumfile(fpath):
# Since we will be doing this for small files, it should be ok
fobj = fopen(fpath)
fobj = salt.utils.fopen(fpath)
m = md5()
while True:
d = fobj.read(8096)
Expand Down