From 65a19da733c08c6cbc7e38270e88608101e5fdeb Mon Sep 17 00:00:00 2001 From: "Victor R. Escobar" Date: Tue, 1 Sep 2020 11:16:41 +0200 Subject: [PATCH 1/2] Corrected typo on URL --- npm/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/package.json b/npm/package.json index 5cbbf8f8b..8d9fdabb4 100644 --- a/npm/package.json +++ b/npm/package.json @@ -12,5 +12,5 @@ }, "keywords": ["python", "compiler", "browser", "javascript"], "author": "Jacques de Hooge", - "homepage": "hhttp://www.transcrypt.org/" + "homepage": "http://www.transcrypt.org/" } From f15854f05bd530a2c2ef6f19e7e53bdf75844406 Mon Sep 17 00:00:00 2001 From: "Victor R. Escobar" Date: Tue, 1 Sep 2020 17:08:01 +0200 Subject: [PATCH 2/2] Fixed class inheritance null type descriptor issue #753 --- setup.py | 2 +- transcrypt/modules/org/transcrypt/__core__.js | 8 ++++---- transcrypt/modules/org/transcrypt/__envir__.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 06a555db3..00f784d40 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ def read (*paths): setup ( name = 'Transcrypt', - version = '3.7.16', + version = '3.7.17', description = 'Python to JavaScript transpiler, supporting multiple inheritance and generating lean, highly readable code', long_description = ( read ('README.rst') diff --git a/transcrypt/modules/org/transcrypt/__core__.js b/transcrypt/modules/org/transcrypt/__core__.js index 606f44fba..3c21f9df9 100644 --- a/transcrypt/modules/org/transcrypt/__core__.js +++ b/transcrypt/modules/org/transcrypt/__core__.js @@ -180,11 +180,11 @@ export var py_metatype = { for (var index = bases.length - 1; index >= 0; index--) { // Reversed order, since class vars of first base should win var base = bases [index]; for (var attrib in base) { - var descrip = Object.getOwnPropertyDescriptor (base, attrib); + var descrip = Object.getOwnPropertyDescriptor (base, attrib) || {}; Object.defineProperty (cls, attrib, descrip); } for (let symbol of Object.getOwnPropertySymbols (base)) { - let descrip = Object.getOwnPropertyDescriptor (base, symbol); + let descrip = Object.getOwnPropertyDescriptor (base, symbol) || {}; Object.defineProperty (cls, symbol, descrip); } } @@ -196,11 +196,11 @@ export var py_metatype = { // Add own methods, properties and own static attributes to the created cls object for (var attrib in attribs) { - var descrip = Object.getOwnPropertyDescriptor (attribs, attrib); + var descrip = Object.getOwnPropertyDescriptor (attribs, attrib) || {}; // As the descriptor can be undefined Object.defineProperty (cls, attrib, descrip); } for (let symbol of Object.getOwnPropertySymbols (attribs)) { - let descrip = Object.getOwnPropertyDescriptor (attribs, symbol); + let descrip = Object.getOwnPropertyDescriptor (attribs, symbol) || {}; Object.defineProperty (cls, symbol, descrip); } diff --git a/transcrypt/modules/org/transcrypt/__envir__.js b/transcrypt/modules/org/transcrypt/__envir__.js index d0805810a..4892f20f1 100644 --- a/transcrypt/modules/org/transcrypt/__envir__.js +++ b/transcrypt/modules/org/transcrypt/__envir__.js @@ -1,4 +1,4 @@ __envir__.interpreter_name = 'python'; __envir__.transpiler_name = 'transcrypt'; __envir__.executor_name = __envir__.transpiler_name; -__envir__.transpiler_version = '3.7.16'; +__envir__.transpiler_version = '3.7.17';