From c58aaff84e4811d318c657aec1eb6151ded3cddf Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 21 Jun 2015 11:38:51 +0530
Subject: [PATCH] ...

---
 resources/rapydscript/compiler.js | 2 +-
 src/calibre/utils/rapydscript.py  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/rapydscript/compiler.js b/resources/rapydscript/compiler.js
index 9ec823eb08..bab8fe7615 100644
--- a/resources/rapydscript/compiler.js
+++ b/resources/rapydscript/compiler.js
@@ -5955,6 +5955,6 @@ function OutputStream(options) {
     });
 })();
 
-rs_baselib_pyj = {"beautifed": {"extends": "function _$rapyd$_extends(child, parent) {\n    child.prototype = Object.create(parent.prototype);\n    child.prototype.constructor = child;\n}", "bind": "function _$rapyd$_bind(fn, thisArg) {\n    var ret;\n    if (fn.orig) {\n        fn = fn.orig;\n    }\n    if (thisArg === false) {\n        return fn;\n    }\n    ret = function() {\n        return fn.apply(thisArg, arguments);\n    };\n    ret.orig = fn;\n    return ret;\n}", "iterable": "function _$rapyd$_Iterable(iterable) {\n    if (iterable instanceof Array || iterable instanceof String || typeof iterable === \"string\") {\n        return iterable;\n    }\n    return Object.keys(iterable);\n}", "mixin": "function _$rapyd$_mixin(target, source, overwrite) {\n    for (var i in source) {\n        if (source.hasOwnProperty(i) && overwrite || typeof target[i] === \"undefined\") {\n            target[i] = source[i];\n        }\n    }\n}", "print": "function _$rapyd$_print() {\n    var args = [].slice.call(arguments, 0);\n    var output;\n    output = JSON.stringify(args);\n    if (typeof console === \"object\") {\n        console.log(output.substr(1, output.length - 2));\n    }\n}", "enumerate": "function enumerate(item) {\n    var arr;\n    arr = [];\n    for (var i=0;i<item.length;i++) {\n        arr[arr.length] = [ i, item[i] ];\n    }\n    return arr;\n}", "getattr": "function getattr(obj, name) {\n    return obj[name];\n}", "in": "function _$rapyd$_in(val, arr) {\n    if (arr instanceof Array || typeof arr === \"string\") {\n        return arr.indexOf(val) !== -1;\n    } else {\n        if (arr.hasOwnProperty(val)) {\n            return true;\n        }\n        return false;\n    }\n}", "reversed": "function reversed(arr) {\n    var tmp;\n    tmp = arr.slice(0);\n    return tmp.reverse();\n}", "hasattr": "function hasattr(obj, name) {\n    return name in obj;\n}", "len": "function len(obj) {\n    var count;\n    if (obj instanceof Array || typeof obj === \"string\") {\n        return obj.length;\n    } else {\n        count = 0;\n        for (var i in obj) {\n            if (obj.hasOwnProperty(i)) {\n                count += 1;\n            }\n        }\n        return count;\n    }\n}", "setattr": "function setattr(obj, name, value) {\n    obj[name] = value;\n}", "range": "function range(start, stop, step) {\n    if (arguments.length <= 1) {\n        stop = start || 0;\n        start = 0;\n    }\n    step = arguments[2] || 1;\n}", "dir": "function dir(item) {\n    var arr;\n    arr = [];\n    for (var i in item) {\n        arr.push(i);\n    }\n    return arr;\n}", "eslice": "function _$rapyd$_eslice(arr, step, start, end) {\n    var isString;\n    arr = arr.slice(0);\n    if (typeof arr === \"string\" || arr instanceof String) {\n        isString = true;\n        arr = arr.split(\"\");\n    }\n}", "abs": "function abs(n) {\n    return Math.abs(n);\n}", "sum": "function sum(arr, start) {\n    if (typeof start === \"undefined\") start = 0;\n    return arr.reduce(function(prev, cur) {\n        return prev + cur;\n    }, start);\n}"}, "minified": {"extends": "function _$rapyd$_extends(child,parent){child.prototype=Object.create(parent.prototype);child.prototype.constructor=child}", "bind": "function _$rapyd$_bind(fn,thisArg){var ret;if(fn.orig){fn=fn.orig}if(thisArg===false){return fn}ret=function(){return fn.apply(thisArg,arguments)};ret.orig=fn;return ret}", "iterable": "function _$rapyd$_Iterable(iterable){if(iterable instanceof Array||iterable instanceof String||typeof iterable===\"string\"){return iterable}return Object.keys(iterable)}", "mixin": "function _$rapyd$_mixin(target,source,overwrite){for(var i in source){if(source.hasOwnProperty(i)&&overwrite||typeof target[i]===\"undefined\"){target[i]=source[i]}}}", "print": "function _$rapyd$_print(){var args=[].slice.call(arguments,0);var output;output=JSON.stringify(args);if(typeof console===\"object\"){console.log(output.substr(1,output.length-2))}}", "enumerate": "function enumerate(item){var arr;arr=[];for(var i=0;i<item.length;i++){arr[arr.length]=[i,item[i]]}return arr}", "getattr": "function getattr(obj,name){return obj[name]}", "in": "function _$rapyd$_in(val,arr){if(arr instanceof Array||typeof arr===\"string\"){return arr.indexOf(val)!==-1}else{if(arr.hasOwnProperty(val)){return true}return false}}", "reversed": "function reversed(arr){var tmp;tmp=arr.slice(0);return tmp.reverse()}", "hasattr": "function hasattr(obj,name){return name in obj}", "len": "function len(obj){var count;if(obj instanceof Array||typeof obj===\"string\"){return obj.length}else{count=0;for(var i in obj){if(obj.hasOwnProperty(i)){count+=1}}return count}}", "setattr": "function setattr(obj,name,value){obj[name]=value}", "range": "function range(start,stop,step){if(arguments.length<=1){stop=start||0;start=0}step=arguments[2]||1}", "dir": "function dir(item){var arr;arr=[];for(var i in item){arr.push(i)}return arr}", "eslice": "function _$rapyd$_eslice(arr,step,start,end){var isString;arr=arr.slice(0);if(typeof arr===\"string\"||arr instanceof String){isString=true;arr=arr.split(\"\")}}", "abs": "function abs(n){return Math.abs(n)}", "sum": "function sum(arr,start){if(typeof start===\"undefined\")start=0;return arr.reduce(function(prev,cur){return prev+cur},start)}"}};
+rs_baselib_pyj = {"minified": {"enumerate": "function enumerate(item){var arr;arr=[];for(var i=0;i<item.length;i++){arr[arr.length]=[i,item[i]]}return arr}", "len": "function len(obj){var count;if(obj instanceof Array||typeof obj===\"string\"){return obj.length}else{count=0;for(var i in obj){if(obj.hasOwnProperty(i)){count+=1}}return count}}", "print": "function _$rapyd$_print(){var args=[].slice.call(arguments,0);if(console instanceof Object){console.log.apply(console,args)}}", "eslice": "function _$rapyd$_eslice(arr,step,start,end){var isString;arr=arr.slice(0);if(typeof arr===\"string\"||arr instanceof String){isString=true;arr=arr.split(\"\")}}", "iterable": "function _$rapyd$_Iterable(iterable){if(iterable instanceof Array||iterable instanceof String||typeof iterable===\"string\"){return iterable}return Object.keys(iterable)}", "getattr": "function getattr(obj,name){return obj[name]}", "reversed": "function reversed(arr){var tmp;tmp=arr.slice(0);return tmp.reverse()}", "mixin": "function _$rapyd$_mixin(target,source,overwrite){for(var i in source){if(source.hasOwnProperty(i)&&overwrite||typeof target[i]===\"undefined\"){target[i]=source[i]}}}", "sum": "function sum(arr,start){if(typeof start===\"undefined\")start=0;return arr.reduce(function(prev,cur){return prev+cur},start)}", "dir": "function dir(item){var arr;arr=[];for(var i in item){arr.push(i)}return arr}", "extends": "function _$rapyd$_extends(child,parent){child.prototype=Object.create(parent.prototype);child.prototype.constructor=child}", "setattr": "function setattr(obj,name,value){obj[name]=value}", "abs": "function abs(n){return Math.abs(n)}", "range": "function range(start,stop,step){if(arguments.length<=1){stop=start||0;start=0}step=arguments[2]||1}", "in": "function _$rapyd$_in(val,arr){if(arr instanceof Array||typeof arr===\"string\"){return arr.indexOf(val)!==-1}else{if(arr.hasOwnProperty(val)){return true}return false}}", "hasattr": "function hasattr(obj,name){return name in obj}", "bind": "function _$rapyd$_bind(fn,thisArg){var ret;if(fn.orig){fn=fn.orig}if(thisArg===false){return fn}ret=function(){return fn.apply(thisArg,arguments)};ret.orig=fn;return ret}"}, "beautifed": {"enumerate": "function enumerate(item) {\n    var arr;\n    arr = [];\n    for (var i=0;i<item.length;i++) {\n        arr[arr.length] = [ i, item[i] ];\n    }\n    return arr;\n}", "len": "function len(obj) {\n    var count;\n    if (obj instanceof Array || typeof obj === \"string\") {\n        return obj.length;\n    } else {\n        count = 0;\n        for (var i in obj) {\n            if (obj.hasOwnProperty(i)) {\n                count += 1;\n            }\n        }\n        return count;\n    }\n}", "print": "function _$rapyd$_print() {\n    var args = [].slice.call(arguments, 0);\n    if (console instanceof Object) {\n        console.log.apply(console, args);\n    }\n}", "eslice": "function _$rapyd$_eslice(arr, step, start, end) {\n    var isString;\n    arr = arr.slice(0);\n    if (typeof arr === \"string\" || arr instanceof String) {\n        isString = true;\n        arr = arr.split(\"\");\n    }\n}", "iterable": "function _$rapyd$_Iterable(iterable) {\n    if (iterable instanceof Array || iterable instanceof String || typeof iterable === \"string\") {\n        return iterable;\n    }\n    return Object.keys(iterable);\n}", "getattr": "function getattr(obj, name) {\n    return obj[name];\n}", "reversed": "function reversed(arr) {\n    var tmp;\n    tmp = arr.slice(0);\n    return tmp.reverse();\n}", "mixin": "function _$rapyd$_mixin(target, source, overwrite) {\n    for (var i in source) {\n        if (source.hasOwnProperty(i) && overwrite || typeof target[i] === \"undefined\") {\n            target[i] = source[i];\n        }\n    }\n}", "sum": "function sum(arr, start) {\n    if (typeof start === \"undefined\") start = 0;\n    return arr.reduce(function(prev, cur) {\n        return prev + cur;\n    }, start);\n}", "dir": "function dir(item) {\n    var arr;\n    arr = [];\n    for (var i in item) {\n        arr.push(i);\n    }\n    return arr;\n}", "extends": "function _$rapyd$_extends(child, parent) {\n    child.prototype = Object.create(parent.prototype);\n    child.prototype.constructor = child;\n}", "setattr": "function setattr(obj, name, value) {\n    obj[name] = value;\n}", "abs": "function abs(n) {\n    return Math.abs(n);\n}", "range": "function range(start, stop, step) {\n    if (arguments.length <= 1) {\n        stop = start || 0;\n        start = 0;\n    }\n    step = arguments[2] || 1;\n}", "in": "function _$rapyd$_in(val, arr) {\n    if (arr instanceof Array || typeof arr === \"string\") {\n        return arr.indexOf(val) !== -1;\n    } else {\n        if (arr.hasOwnProperty(val)) {\n            return true;\n        }\n        return false;\n    }\n}", "hasattr": "function hasattr(obj, name) {\n    return name in obj;\n}", "bind": "function _$rapyd$_bind(fn, thisArg) {\n    var ret;\n    if (fn.orig) {\n        fn = fn.orig;\n    }\n    if (thisArg === false) {\n        return fn;\n    }\n    ret = function() {\n        return fn.apply(thisArg, arguments);\n    };\n    ret.orig = fn;\n    return ret;\n}"}};
 
 rs_package_version = "0.3.4";
diff --git a/src/calibre/utils/rapydscript.py b/src/calibre/utils/rapydscript.py
index de517d1713..efca5de49b 100644
--- a/src/calibre/utils/rapydscript.py
+++ b/src/calibre/utils/rapydscript.py
@@ -36,6 +36,8 @@ def parse_baselib(src):
             else:
                 in_func.append(line)
     funcs = {k:'\n'.join(v) for k, v in funcs.iteritems()}
+    # use my own version of print
+    funcs['print'] = 'def _$rapyd$_print(*args):\n    if isinstance(console, Object): console.log.apply(console, args)\n'
     return funcs
 
 def compile_baselib(ctx, baselib, beautify=True):