From 0681deb3c9fab8c53977818d60261533c3968a54 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Wed, 23 Dec 2020 15:07:12 +0000 Subject: [PATCH] js: fix Python 3 support in make_umd.py --- modules/js/src/make_umd.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/modules/js/src/make_umd.py b/modules/js/src/make_umd.py index 08d9e39..bed6ee9 100644 --- a/modules/js/src/make_umd.py +++ b/modules/js/src/make_umd.py @@ -69,13 +69,16 @@ import os, sys, re, json, shutil from subprocess import Popen, PIPE, STDOUT +PY3 = sys.version_info >= (3, 0) + def make_umd(opencvjs, cvjs): - src = open(opencvjs, 'r+b') - dst = open(cvjs, 'w+b') - content = src.read() - dst.seek(0) - # inspired by https://github.com/umdjs/umd/blob/95563fd6b46f06bda0af143ff67292e7f6ede6b7/templates/returnExportsGlobal.js - dst.write((""" + with open(opencvjs, 'r+b') as src: + content = src.read() + if PY3: # content is bytes + content = content.decode('utf-8') + with open(cvjs, 'w+b') as dst: + # inspired by https://github.com/umdjs/umd/blob/95563fd6b46f06bda0af143ff67292e7f6ede6b7/templates/returnExportsGlobal.js + dst.write((""" (function (root, factory) { if (typeof define === 'function' && define.amd) { // AMD. Register as an anonymous module. @@ -103,7 +106,8 @@ def make_umd(opencvjs, cvjs): Module = {}; return cv(Module); })); - """ % (content)).lstrip().encode()) + """ % (content)).lstrip().encode('utf-8')) + if __name__ == "__main__": if len(sys.argv) > 2: -- 2.7.4