summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaserEyess <lasereyess@users.noreply.github.com>2020-11-22 20:53:08 -0500
committersfan5 <sfan5@live.de>2020-11-27 11:17:29 +0100
commit8886f017a150743a8113ee53220889c54400ece6 (patch)
tree658460dbec2568760a933b3ec9936feec73271b6
parentd7e80dee2649463edae50284c4e7f1f40cb2fadf (diff)
downloadmpv-8886f017a150743a8113ee53220889c54400ece6.tar.bz2
mpv-8886f017a150743a8113ee53220889c54400ece6.tar.xz
matroska.py: remove python2 support
Since 0.33.0 mpv does not support python2. This commit removes python2 support from the file completely with the following changes: - __future__ import of print_function is python2 only - unicode literals are legacy in python3 - 'sys.version_info.major < 3' check is redundant
-rwxr-xr-xTOOLS/matroska.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/TOOLS/matroska.py b/TOOLS/matroska.py
index 2c1b751a54..d75c45a715 100755
--- a/TOOLS/matroska.py
+++ b/TOOLS/matroska.py
@@ -21,8 +21,6 @@ Can also be used to directly parse Matroska files and display their contents.
# License along with mpv. If not, see <http://www.gnu.org/licenses/>.
#
-# for compatibility with Python 2.x
-from __future__ import print_function
elements_ebml = (
'EBML, 1a45dfa3, sub', (
@@ -300,8 +298,8 @@ parse_elems(elements_ebml, 'EBML')
parse_elems(elements_matroska, 'MATROSKA')
def printf(out, *args):
- out.write(u' '.join([str(x) for x in args]))
- out.write(u'\n')
+ out.write(' '.join(str(x) for x in args))
+ out.write('\n')
def generate_C_header(out):
printf(out, '// Generated by TOOLS/matroska.py, do not edit manually')
@@ -466,8 +464,6 @@ if __name__ == "__main__":
elif sys.argv[1] == '--generate-definitions':
generate_C_definitions(sys.stdout)
else:
- if sys.version_info.major < 3:
- raise Exception("Dumping requires Python 3.")
s = open(sys.argv[1], "rb")
while 1:
start = s.tell()