From c900314673f962d331ac8d91bd2d6bdd6c684279 Mon Sep 17 00:00:00 2001 From: Austin Schick Date: Sun, 4 Feb 2024 02:28:31 -0500 Subject: [PATCH] Using existing invalid() function to generate new int error message --- www/src/brython.js | 7 +++---- www/src/py_int.js | 3 +-- www/src/version_info.js | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/www/src/brython.js b/www/src/brython.js index 2f9b47c2e..0efbdeb5e 100644 --- a/www/src/brython.js +++ b/www/src/brython.js @@ -159,8 +159,8 @@ $B.stdlib_module_names=Object.keys($B.stdlib)})(__BRYTHON__) ; __BRYTHON__.implementation=[3,12,1,'dev',0] __BRYTHON__.version_info=[3,12,0,'final',0] -__BRYTHON__.compiled_date="2024-02-04 02:18:13.593848" -__BRYTHON__.timestamp=1707031093593 +__BRYTHON__.compiled_date="2024-02-04 02:27:37.926428" +__BRYTHON__.timestamp=1707031657926 __BRYTHON__.builtin_module_names=["_ajax","_ast","_base64","_binascii","_io_classes","_json","_jsre","_locale","_multiprocessing","_posixsubprocess","_profile","_random","_sre","_sre_utils","_string","_strptime","_svg","_symtable","_tokenize","_webcomponent","_webworker","_zlib_utils","array","builtins","dis","encoding_cp932","hashlib","html_parser","marshal","math","modulefinder","posix","pyexpat","python_re","unicodedata"] ; (function($B){var _b_=$B.builtins @@ -11637,8 +11637,7 @@ var _value=value.trim(), sign='' if(_value.startsWith('+')||_value.startsWith('-')){sign=_value[0] _value=_value.substr(1)} -if(_value.length==0){throw _b_.ValueError.$factory( -`invalid literal for int() with base 10: ${_b_.repr(value)}`)} +if(_value.length==0){invalid(base)} if(_value.length==2 && base==0 && (_value=="0b" ||_value=="0o" ||_value=="0x")){throw _b_.ValueError.$factory("invalid value")} if(_value.endsWith('_')){invalid(base)} diff --git a/www/src/py_int.js b/www/src/py_int.js index c445cfaea..18ed2c12d 100644 --- a/www/src/py_int.js +++ b/www/src/py_int.js @@ -777,8 +777,7 @@ int.$factory = function(){ } if (_value.length == 0) { - throw _b_.ValueError.$factory( - `invalid literal for int() with base 10: ${_b_.repr(value)}`) + invalid(base) } if(_value.length == 2 && base == 0 && diff --git a/www/src/version_info.js b/www/src/version_info.js index b5602c87b..b49b3cfb5 100644 --- a/www/src/version_info.js +++ b/www/src/version_info.js @@ -1,7 +1,7 @@ __BRYTHON__.implementation = [3, 12, 1, 'dev', 0] __BRYTHON__.version_info = [3, 12, 0, 'final', 0] -__BRYTHON__.compiled_date = "2024-02-04 02:18:13.593848" -__BRYTHON__.timestamp = 1707031093593 +__BRYTHON__.compiled_date = "2024-02-04 02:27:37.926428" +__BRYTHON__.timestamp = 1707031657926 __BRYTHON__.builtin_module_names = ["_ajax", "_ast", "_base64",