From cac9e434b29f7998aeb545899d35181d23f0508d Mon Sep 17 00:00:00 2001 From: rallytime Date: Sun, 15 Nov 2015 15:11:27 -0700 Subject: [PATCH 1/2] Fix doc build error by importing from salt.ext.six.moves. --- salt/runners/asam.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/runners/asam.py b/salt/runners/asam.py index 5d6bc44b3d..cddd4547a7 100644 --- a/salt/runners/asam.py +++ b/salt/runners/asam.py @@ -38,7 +38,7 @@ HAS_LIBS = False HAS_SIX = False try: import requests - from six.moves.html_parser import HTMLParser + from salt.ext.six.moves.html_parser import HTMLParser try: import salt.ext.six as six HAS_SIX = True From e990c908654dd44fa027d21f23692382662b943c Mon Sep 17 00:00:00 2001 From: rallytime Date: Sun, 15 Nov 2015 20:01:07 -0700 Subject: [PATCH 2/2] Ignore pylint import error --- salt/runners/asam.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/runners/asam.py b/salt/runners/asam.py index cddd4547a7..dbd006777f 100644 --- a/salt/runners/asam.py +++ b/salt/runners/asam.py @@ -38,7 +38,7 @@ HAS_LIBS = False HAS_SIX = False try: import requests - from salt.ext.six.moves.html_parser import HTMLParser + from salt.ext.six.moves.html_parser import HTMLParser # pylint: disable=E0611 try: import salt.ext.six as six HAS_SIX = True