saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert import changes

Browse source
This commit is contained in:
Joe Eacott 2020-04-23 18:41:52 -06:00 • committed by Daniel Wozniak
parent b4d9b845c9
commit d34ce4610b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/fileclient.py
View file

@ -40,10 +40,12 @@ from salt.exceptions import CommandExecutionError, MinionError
from salt.ext import six
from salt.ext.six.moves.urllib.error import HTTPError, URLError
from salt.ext.six.moves.urllib.parse import urlparse, urlunparse
from salt.ext.tornado.httputil import (
HTTPHeaders,
HTTPInputError,
parse_response_start_line,
)
from salt.utils.openstack.swift import SaltSwift
from tornado.httputil import HTTPHeaders, HTTPInputError, parse_response_start_line
# pylint: enable=no-name-in-module,import-error
log = logging.getLogger(__name__)
MAX_FILENAME_LENGTH = 255