diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2021-02-05 23:50:53 -0800 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2021-02-11 15:30:57 +0100 |
| commit | e3e913ef8fc61cc07ba8ff2da3c5f5fb1cd5590e (patch) | |
| tree | 747a7fdca116f00ca87c517492c01220c64aa63b /lib | |
| parent | 52508e6ee7caab8a9987f40350a9ed5b571ee656 (diff) | |
| download | spack-e3e913ef8fc61cc07ba8ff2da3c5f5fb1cd5590e.tar.gz spack-e3e913ef8fc61cc07ba8ff2da3c5f5fb1cd5590e.tar.bz2 spack-e3e913ef8fc61cc07ba8ff2da3c5f5fb1cd5590e.tar.xz spack-e3e913ef8fc61cc07ba8ff2da3c5f5fb1cd5590e.zip | |
spack_json: _strify should be a no-op in Python 3
_strify traverses *all* of the read-in data and converts strings, but
only for Python 2. Ignore it in Python 3.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/util/spack_json.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/spack/spack/util/spack_json.py b/lib/spack/spack/util/spack_json.py index ae26b97d54..62fd9ca824 100644 --- a/lib/spack/spack/util/spack_json.py +++ b/lib/spack/spack/util/spack_json.py @@ -38,10 +38,14 @@ def dump(data, stream=None): def _strify(data, ignore_dicts=False): + """Converts python 2 unicodes to str in JSON data.""" + # this is a no-op in python 3 + if sys.version_info[0] >= 3: + return data + # if this is a unicode string in python 2, return its string representation - if sys.version_info[0] < 3: - if isinstance(data, string_types): - return data.encode('utf-8') + if isinstance(data, string_types): + return data.encode('utf-8') # if this is a list of values, return list of byteified values if isinstance(data, list): |