ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-10-04 15:34:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add Python 3 support for validate-modules test. (#21195)

Browse source 
* Improve PEP8 compatibility

* Fix Python 3 incompatibility

Is prohibited to mutate OrderedDict during iteration through it so
is better to add records with error or warning to empty dictionary
instead of delete records from copy of dictionary during iterating.

* Decode output of subprocess from bytes to unicode.

* Add Python 3 support for validate-modules test.

Fix #18367
This commit is contained in:
Lumír 'Frenzy' Balhar 2017-04-10 16:43:39 +02:00 • committed by Toshio Kuratomi
commit 9d41aefd71
4 changed files with 54 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

9
test/sanity/validate-modules/utils.py
View file

@ -19,8 +19,7 @@
import ast
import sys
# We only use StringIO, since we cannot setattr on cStringIO
from StringIO import StringIO
from io import BytesIO, TextIOWrapper
import yaml
import yaml.reader
@ -55,10 +54,8 @@ class CaptureStd():
def __enter__(self):
self.sys_stdout = sys.stdout
self.sys_stderr = sys.stderr
sys.stdout = self.stdout = StringIO()
sys.stderr = self.stderr = StringIO()
setattr(sys.stdout, 'encoding', self.sys_stdout.encoding)
setattr(sys.stderr, 'encoding', self.sys_stderr.encoding)
sys.stdout = self.stdout = TextIOWrapper(BytesIO(), encoding=self.sys_stdout.encoding)
sys.stderr = self.stderr = TextIOWrapper(BytesIO(), encoding=self.sys_stderr.encoding)
return self
def __exit__(self, exc_type, exc_value, traceback):