summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <toshio@fedoraproject.org>2016-04-08 12:19:39 -0700
committerToshio Kuratomi <toshio@fedoraproject.org>2016-04-08 12:19:39 -0700
commit658e04d07f9c755526820f235d6807b23931fea1 (patch)
tree9d05982f4abd41b929d15f4db173ce0a1dd1418a
parent7d6bbbb60d926cec7ed24d4a70d5db3cbdd425f2 (diff)
downloadansible-remove-legacy-workaround-from-debug-strategy.tar.gz
These should be to_uniocde because they're being sent to display()remove-legacy-workaround-from-debug-strategy
-rw-r--r--lib/ansible/plugins/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ansible/plugins/__init__.py b/lib/ansible/plugins/__init__.py
index 14fc20fb9e..3216a9235b 100644
--- a/lib/ansible/plugins/__init__.py
+++ b/lib/ansible/plugins/__init__.py
@@ -31,7 +31,7 @@ import warnings
from collections import defaultdict
from ansible import constants as C
-from ansible.utils.unicode import to_str
+from ansible.utils.unicode import to_unicode
try:
from __main__ import display
@@ -248,7 +248,7 @@ class PluginLoader:
try:
full_paths = (os.path.join(path, f) for f in os.listdir(path))
except OSError as e:
- display.warning("Error accessing plugin paths: %s" % to_str(e))
+ display.warning("Error accessing plugin paths: %s" % to_unicode(e))
for full_path in (f for f in full_paths if os.path.isfile(f) and not f.endswith('__init__.py')):
full_name = os.path.basename(full_path)
@@ -370,7 +370,7 @@ class PluginLoader:
try:
obj = getattr(self._module_cache[path], self.class_name)
except AttributeError as e:
- display.warning("Skipping plugin (%s) as it seems to be invalid: %s" % (path, to_str(e)))
+ display.warning("Skipping plugin (%s) as it seems to be invalid: %s" % (path, to_unicode(e)))
if self.base_class:
# The import path is hardcoded and should be the right place,