diff options
| author | Zachary Turner <zturner@google.com> | 2015-11-06 21:37:33 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2015-11-06 21:37:33 +0000 |
| commit | e73a0601bd1f208d4b4e30ffa6f53775e8c92f6c (patch) | |
| tree | 5bcfbd2cf133b8c444ce573037dc218c95fb4288 /lldb/packages/Python/lldbsuite/test/dotest.py | |
| parent | 5821f7971429f94faaf35757b4e029326f1c53da (diff) | |
| download | bcm5719-llvm-e73a0601bd1f208d4b4e30ffa6f53775e8c92f6c.tar.gz bcm5719-llvm-e73a0601bd1f208d4b4e30ffa6f53775e8c92f6c.zip | |
Python 3 - Port use of string.maketrans and don't use sets.Set.
`sets.Set` has been deprecated in favor of `set` since 2.6, and
`string.maketrans` has to be special cased. In Python 3 there
is `str.maketrans`, `bytes.maketrans`, and `bytearray.maketrans`
and you have to choose the correct one. So we need to introduce
a runtime version check at this site.
llvm-svn: 252348
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/dotest.py')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dotest.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 05152a3278e..2fcc6796cfc 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -1726,8 +1726,10 @@ def run_suite(): if iterArchs or iterCompilers: # Translate ' ' to '-' for pathname component. - from string import maketrans - tbl = maketrans(' ', '-') + if six.PY2: + tbl = string.maketrans(' ', '-') + else: + tbl = str.maketrans(' ', '-') configPostfix = configString.translate(tbl) # Check whether we need to split stderr/stdout into configuration |
