diff options
| author | Christian Clauss <cclauss@me.com> | 2019-09-03 09:34:54 +0200 |
|---|---|---|
| committer | Sam Roberts <vieuxtech@gmail.com> | 2019-09-03 09:31:14 -0700 |
| commit | 40060f4e42a9f2c79d14c704f4496320b18c0483 (patch) | |
| tree | ef435a33df1ab66cea7d4a2eb3319bbee8832ad9 /tools | |
| parent | 6ce87c027dc2a16e1b8d85c753b52270ae0c6054 (diff) | |
| download | android-node-v8-40060f4e42a9f2c79d14c704f4496320b18c0483.tar.gz android-node-v8-40060f4e42a9f2c79d14c704f4496320b18c0483.tar.bz2 android-node-v8-40060f4e42a9f2c79d14c704f4496320b18c0483.zip | |
gyp: make StringIO work in ninja.py
Allow both Python 2 and 3 to access StringIO.
This fixes `./configure --ninja`, which was broken by
https://github.com/nodejs/node/pull/29371.
See: https://github.com/nodejs/node/pull/29371#issuecomment-527331969
PR-URL: https://github.com/nodejs/node/pull/29414
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/ninja.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/gyp/pylib/gyp/generator/ninja.py b/tools/gyp/pylib/gyp/generator/ninja.py index 7d1d3b7b30..e66979ddbb 100644 --- a/tools/gyp/pylib/gyp/generator/ninja.py +++ b/tools/gyp/pylib/gyp/generator/ninja.py @@ -20,7 +20,10 @@ from gyp.common import OrderedSet import gyp.msvs_emulation import gyp.MSVSUtil as MSVSUtil import gyp.xcode_emulation -from io import StringIO +try: + from cStringIO import StringIO +except ImportError: + from io import StringIO from gyp.common import GetEnvironFallback import gyp.ninja_syntax as ninja_syntax |