mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 06:00:43 +00:00
patman: Fix doctest StringIO import for python 3.x
In python 3.x StringIO is no longer a module, and the class can instead be found in the io module. Adjust the code in the doctest input to account for both. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
c9eac38a25
commit
f5d44b9bae
1 changed files with 8 additions and 5 deletions
|
@ -36,7 +36,10 @@ class _ProjectConfigParser(ConfigParser.SafeConfigParser):
|
|||
- Merge general default settings/aliases with project-specific ones.
|
||||
|
||||
# Sample config used for tests below...
|
||||
>>> import StringIO
|
||||
>>> try:
|
||||
... from StringIO import StringIO
|
||||
... except ImportError:
|
||||
... from io import StringIO
|
||||
>>> sample_config = '''
|
||||
... [alias]
|
||||
... me: Peter P. <likesspiders@example.com>
|
||||
|
@ -54,25 +57,25 @@ class _ProjectConfigParser(ConfigParser.SafeConfigParser):
|
|||
|
||||
# Check to make sure that bogus project gets general alias.
|
||||
>>> config = _ProjectConfigParser("zzz")
|
||||
>>> config.readfp(StringIO.StringIO(sample_config))
|
||||
>>> config.readfp(StringIO(sample_config))
|
||||
>>> config.get("alias", "enemies")
|
||||
'Evil <evil@example.com>'
|
||||
|
||||
# Check to make sure that alias gets overridden by project.
|
||||
>>> config = _ProjectConfigParser("sm")
|
||||
>>> config.readfp(StringIO.StringIO(sample_config))
|
||||
>>> config.readfp(StringIO(sample_config))
|
||||
>>> config.get("alias", "enemies")
|
||||
'Green G. <ugly@example.com>'
|
||||
|
||||
# Check to make sure that settings get merged with project.
|
||||
>>> config = _ProjectConfigParser("linux")
|
||||
>>> config.readfp(StringIO.StringIO(sample_config))
|
||||
>>> config.readfp(StringIO(sample_config))
|
||||
>>> sorted(config.items("settings"))
|
||||
[('am_hero', 'True'), ('process_tags', 'False')]
|
||||
|
||||
# Check to make sure that settings works with unknown project.
|
||||
>>> config = _ProjectConfigParser("unknown")
|
||||
>>> config.readfp(StringIO.StringIO(sample_config))
|
||||
>>> config.readfp(StringIO(sample_config))
|
||||
>>> sorted(config.items("settings"))
|
||||
[('am_hero', 'True')]
|
||||
"""
|
||||
|
|
Loading…
Reference in a new issue