From 6100ac6368af91bb4d772bb170cb652c66855a5e Mon Sep 17 00:00:00 2001 From: RunasSudo Date: Tue, 5 Dec 2017 09:13:39 +1030 Subject: [PATCH] Update for Transcrypt 3.6.60 Transcrypt bug 387 closed --- build_js.sh | 10 ++-------- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/build_js.sh b/build_js.sh index 9038596..54f80d8 100755 --- a/build_js.sh +++ b/build_js.sh @@ -15,11 +15,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -FLAGS=-k +FLAGS="-k -mc -o" #for f in eos.js eos.js_tests; do for f in eos.js_tests; do - transcrypt -b -n -o $FLAGS $f.py || exit 1 + transcrypt -b -n $FLAGS $f.py || exit 1 # Javascript identifiers cannot contain dots perl -0777 -pi -e 's/eos.js/eosjs/g' eos/__javascript__/$f.js @@ -35,14 +35,8 @@ for f in eos.js_tests; do # Fix handling of properties, Transcrypt bug #407 perl -077 -pi -e 's/var __get__ = function \(self, func, quotedFuncName\) \{/var __get__ = function (self, func, quotedFuncName) { if(typeof(func) != "function"){return func;}/g' eos/__javascript__/$f.js - - # Transcrypt bug #407 perl -0777 -pi -e 's/property.call \((.*?), \g1.\g1.__impl__(.*?)\)/property.call ($1, $1.__impl__$2)/g' eos/__javascript__/$f.js perl -0777 -pi -e 's/property.call \((.*?), \g1.\g1.__implpy_(.*?)\)/property.call ($1, $1.__impl__$2)/g' eos/__javascript__/$f.js - - # Transcrypt bug #387 - perl -0777 -pi -e 's/var __nest__ = function \(headObject, tailNames, value\) \{/var __nest__ = function (headObject, tailNames, value) { if (headObject === __all__ && value.__all__) { value.__all__.__module__ = tailNames; }/g' eos/__javascript__/$f.js - perl -0777 -pi -e "s/var (.*?) = __class__ \('\g1', \[(.*?)\], \{/var "'$1'" = __class__ ('"'$1'"', ["'$2'"], { __module__: __all__.__module__,/g" eos/__javascript__/$f.js done cp eos/__javascript__/eos.js_tests.js eosweb/core/static/js/eosjs.js diff --git a/requirements.txt b/requirements.txt index a4ccf56..0898d37 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ pymongo==3.5.1 requests==2.18.4 requests-oauthlib==0.8.0 six==1.10.0 -Transcrypt==3.6.58 +Transcrypt==3.6.60 typed-ast==1.1.0 urllib3==1.22 Werkzeug==0.12.2