mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 23:50:26 +09:00
patman: Drop Python 2 StringIO code
We can rely on Python 3 now, so drop the workaround for importing StringIO. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
83a4518771
commit
c3a13cc333
@ -12,10 +12,7 @@ import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
try:
|
||||
from StringIO import StringIO
|
||||
except ImportError:
|
||||
from io import StringIO
|
||||
from io import StringIO
|
||||
|
||||
import gitutil
|
||||
import patchstream
|
||||
|
@ -34,10 +34,7 @@ class _ProjectConfigParser(ConfigParser.SafeConfigParser):
|
||||
- Merge general default settings/aliases with project-specific ones.
|
||||
|
||||
# Sample config used for tests below...
|
||||
>>> try:
|
||||
... from StringIO import StringIO
|
||||
... except ImportError:
|
||||
... from io import StringIO
|
||||
>>> from io import StringIO
|
||||
>>> sample_config = '''
|
||||
... [alias]
|
||||
... me: Peter P. <likesspiders@example.com>
|
||||
|
@ -10,10 +10,7 @@ import sys
|
||||
|
||||
import command
|
||||
|
||||
try:
|
||||
from StringIO import StringIO
|
||||
except ImportError:
|
||||
from io import StringIO
|
||||
from io import StringIO
|
||||
|
||||
PYTHON = 'python%d' % sys.version_info[0]
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user