valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #28909 from rallytime/doc-build-err

Browse Source 
Fix doc build error by importing from salt.ext.six.moves.
This commit is contained in:
Mike Place 2015-11-16 07:23:43 -07:00
commit 9daf66f2ea
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/runners/asam.py
View File

@ -38,7 +38,7 @@ HAS_LIBS = False
HAS_SIX = False HAS_SIX = False
try: try:
import requests import requests
from six.moves.html_parser import HTMLParser from salt.ext.six.moves.html_parser import HTMLParser # pylint: disable=E0611
try: try:
import salt.ext.six as six import salt.ext.six as six
HAS_SIX = True HAS_SIX = True