diff options
| -rwxr-xr-x | TOOLS/file2string.py | 6 | ||||
| -rwxr-xr-x | TOOLS/matroska.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/TOOLS/file2string.py b/TOOLS/file2string.py index cb121e4884..35c89cb731 100755 --- a/TOOLS/file2string.py +++ b/TOOLS/file2string.py @@ -7,6 +7,10 @@ import sys +# Indexing a byte string yields int on Python 3.x, and a str on Python 2.x +def pord(c): + return ord(c) if type(c) == str else c + def main(infile): conv = ['\\' + ("%03o" % c) for c in range(256)] safe_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" \ @@ -16,7 +20,7 @@ def main(infile): for c, esc in ("\nn", "\tt", r"\\", '""'): conv[ord(c)] = '\\' + esc for line in infile: - sys.stdout.write('"' + ''.join(conv[c] for c in line) + '"\n') + sys.stdout.write('"' + ''.join(conv[pord(c)] for c in line) + '"\n') with open(sys.argv[1], 'rb') as infile: sys.stdout.write("// Generated from %s\n\n" % sys.argv[1]) diff --git a/TOOLS/matroska.py b/TOOLS/matroska.py index ffa388e47b..ab5684f1ed 100755 --- a/TOOLS/matroska.py +++ b/TOOLS/matroska.py @@ -22,6 +22,8 @@ Can also be used to directly parse Matroska files and display their contents. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +# for compatibility with Python 2.x +from __future__ import print_function elements_ebml = ( 'EBML, 1a45dfa3, sub', ( |