holado 0.2.7__py3-none-any.whl → 0.2.8__py3-none-any.whl

{holado-0.2.7.dist-info → holado-0.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.2.7
+Version: 0.2.8
 Summary: HolAdo framework
 Project-URL: Homepage, https://gitlab.com/holado_framework/python
 Project-URL: Issues, https://gitlab.com/holado_framework/python/-/issues
@@ -53,6 +53,9 @@ Requires-Dist: moto; extra == 's3'
 Provides-Extra: sftp
 Requires-Dist: pysftp; extra == 'sftp'
 Requires-Dist: sftpserver; extra == 'sftp'
+Provides-Extra: ssl
+Requires-Dist: certifi; extra == 'ssl'
+Requires-Dist: pip-system-certs; extra == 'ssl'
 Provides-Extra: ws-suds
 Requires-Dist: suds; extra == 'ws-suds'
 Provides-Extra: ws-zeep

{holado-0.2.7.dist-info → holado-0.2.8.dist-info}/RECORD

@@ -102,7 +102,7 @@ holado_core/common/resource/persisted_method_to_call_manager.py,sha256=M_1G8OKwO
 holado_core/common/resource/resource_manager.py,sha256=3UmKaZGfCGJUJ9EvwHibuf6ILANshl6zVK6CkGDrtwo,7182
 holado_core/common/tables/__init__.py,sha256=i2-gExPOUa_AnmEPgZJQ2lAXeK02PLpPnjEqbsgj1Co,8
 holado_core/common/tables/enums.py,sha256=YtYTSI1m6KQ3XFzOSFPi5De6Jc-nkDMTbnmqfRfsiJ0,1395
-holado_core/common/tables/table.py,sha256=_kBkW-S12t8nh897r-4DUfZ7Bvi-pE2oCZpog7RtSRM,10193
+holado_core/common/tables/table.py,sha256=VV-68K0J7lzgWpmzesYdU3-ZrkmaIfu9eIYlNhAA02c,10252
 holado_core/common/tables/table_cell.py,sha256=O7pfDg1MVZOOgU_sQ3MkWDtT2VJGJwCHbiyTXvdvVmI,5036
 holado_core/common/tables/table_manager.py,sha256=cKS8JM2JSaN6O38e71kIkRjsfgn8QVPXcs24BZfTN-U,17200
 holado_core/common/tables/table_row.py,sha256=t0c9IS3F2DSuewl6obkfC3tHeI-AsdNAHArQoLf9jyM,6662
@@ -126,7 +126,7 @@ holado_core/common/tables/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 holado_core/common/tables/converters/table_converter.py,sha256=lFt1NKFo5aMPMpKQi_krBdVYUlm8zEg3JbDOy4bwWyA,8200
 holado_core/common/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 holado_core/common/tools/path_manager.py,sha256=dgdm8wAaVubh-krpquCXXeGUTtGqRKDpuEKmvhA9dKA,8899
-holado_core/common/tools/string_tools.py,sha256=j6ErNwpz19AXmbuvMk1HakX0EXfOkgu3s6bVohdz1g8,5365
+holado_core/common/tools/string_tools.py,sha256=bQuMlI_yS7OoSPFL7qyfyXkrnjC8xHVpIsfmEC6JxhI,5590
 holado_core/common/tools/tools.py,sha256=N-MfdMPYQs2BVnX4QWgop5PflzanboHjOeKgoSmpB1o,9062
 holado_core/common/tools/comparators/comparator.py,sha256=K4LcXIRORHX5vkmDibI6P6Bu1L-6Xezb63ZzzOMKrWY,6812
 holado_core/common/tools/comparators/object_comparator.py,sha256=RPI319h_tij6z75UVbZII3gBggQolRFMNMD4cN6z37Y,1399
@@ -138,7 +138,7 @@ holado_core/tests/behave/steps/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 holado_core/tests/behave/steps/common/common_steps.py,sha256=SAsi_UD9khKfXfS23IEQIPp4sTLG4EkDXrjc-9a9yDg,6295
 holado_core/tests/behave/steps/common/config_steps.py,sha256=fuV-83Aol9J92Ho9c-bt48G6ARbTM0vyfritQo-GpvY,1910
 holado_core/tests/behave/steps/common/resource_steps.py,sha256=FPQpN6I-vsxIkqTOSyB9i8P7oyg7Mf1XepHiPzmrlMk,3030
-holado_core/tests/behave/steps/common/tables_steps.py,sha256=Xr40QDcaJM9T1DKIKer1MxYR1ypqEcW-LDGVurE5b0o,26382
+holado_core/tests/behave/steps/common/tables_steps.py,sha256=XWd_VXEtL4Joa-8KKYE5hERlmypqUbRQK05d_QdF9b8,26856
 holado_core/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 holado_core/tools/abstracts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 holado_core/tools/abstracts/blocking_command_service.py,sha256=8EFNQZONFw1jeGAG7gJ59FmookKkjiC4IYkk2UTsbSs,2603
@@ -196,7 +196,7 @@ holado_helper/docker/run_terminal_in_docker.sh,sha256=GOOhbo9cEjw5Pp5BlhbzZm2U5X
 holado_helper/holado_module_template/__init__.py,sha256=KpbIi2cm1BYZgoWf0LuhE0ei3ZCE15UcUtjC1cSA55M,1653
 holado_helper/holado_module_template/test/behave/steps/__init__.py,sha256=BHp8TYE_X4lWn4B8A51nXSYaJlczuiDVJLcKMy7p0Lw,1267
 holado_helper/holado_module_template/test/behave/steps/private/__init__.py,sha256=BHp8TYE_X4lWn4B8A51nXSYaJlczuiDVJLcKMy7p0Lw,1267
-holado_helper/script/action.py,sha256=e2RFH2krmNMB3MLTIHukJcAZH6zNgxTJlJJmkW-ifFI,5800
+holado_helper/script/action.py,sha256=YPLS-3Ot-bti9d6VxilW5PwfYCU64hFd1qK1d2XepFY,6187
 holado_helper/script/action_script.py,sha256=6yhb7M9aGe6jbqA4APa2rc3zC3INXvNTZjpGXDWMBug,22543
 holado_helper/script/any_action_script.py,sha256=6P1bG3UoSO0JVS6kWaDGd4jP7MN-foiThRcVitW3Hjg,7901
 holado_helper/script/behave_action_script.py,sha256=DwIRdHrRBM9qcLxoSx0vtyy3RX308g8bRlLT-UAqimM,5148
@@ -272,11 +272,11 @@ holado_python/standard_library/hashlib.py,sha256=si-j4L7OJa-oGdoo1lKy4VFeqs7oYqj
 holado_python/standard_library/multiprocessing.py,sha256=vThmJzdDTtdFyGUL3i3evmt2JBUK-jrorKbEtQ7TSFU,2786
 holado_python/standard_library/queue.py,sha256=RIFid85_CMFmanpt61LSaYqeHdlFwAuhcpBhxgyWj_o,3059
 holado_python/standard_library/typing.py,sha256=8F9Iolh-c9GbDGlNr3V6uPdTEhSBdkLQu46oVwHPYKk,7693
-holado_python/standard_library/socket/blocking_socket.py,sha256=GTINrtk3iAkRrt8TRhJlZuTmw_xqQFu0s9i3ZOjP_2Y,5870
-holado_python/standard_library/socket/echo_server.py,sha256=L857lAJez6OtJS899zGgqdpcG0US42AjIOBIJQcXCDM,1648
-holado_python/standard_library/socket/message_socket.py,sha256=oXFxqERHq7UoyFtR5-xqTrZtVqlgx6DswM6zy3rkO5A,3567
-holado_python/standard_library/socket/non_blocking_socket.py,sha256=yDmgGtLAHSe_gNPrpEsUBgU8TWFcObzF0cazcf6fbvg,5891
-holado_python/standard_library/socket/socket.py,sha256=iXZuBRmojkqzoPZkkFyJVjSLSHQoW93nkbbtpVkT4SQ,5817
+holado_python/standard_library/socket/blocking_socket.py,sha256=LHDBlK2r6tgpNTzUpYiG55QZMpjQ9seGarQMct6s5ZU,9292
+holado_python/standard_library/socket/echo_server.py,sha256=ntApbwcckiEEBw-qjE487An81i4IEVFRPkoFbUrcCL4,1793
+holado_python/standard_library/socket/message_socket.py,sha256=yceHseE5JyOH-dzWRvXrrrIzhCY-nyQLGIc78_FrPIs,5396
+holado_python/standard_library/socket/non_blocking_socket.py,sha256=PHTTwzVkOHpGEGD4kKHdOm8S38y--BXBstqO33O4paA,6924
+holado_python/standard_library/socket/socket.py,sha256=TKxgN9EXes9VfiGQ9q7k25dmrNzQpoajFimRJSATa4M,11145
 holado_python/standard_library/ssl/ssl.py,sha256=9HMOo7YrUWLfgTtPbN1oNDZuGdEPeq8gum85LDpK-l4,4051
 holado_python/standard_library/ssl/resources/certificates/NOTES.txt,sha256=7VKjsrIAwxKtRrzul_4TKGQtknNBbFOeuLUc1lhkHNg,383
 holado_python/standard_library/ssl/resources/certificates/localhost.crt,sha256=iLmZpDuOQVawUlbZkb72g2-uv1c4SAmRJOrm4Th5anY,1123
@@ -290,8 +290,8 @@ holado_python/tests/behave/steps/standard_library/datetime_steps.py,sha256=1XZ2D
 holado_python/tests/behave/steps/standard_library/hashlib_steps.py,sha256=TI1WXL0nDU6p7ri7VotOK57IssBH8cKuFq3T61ip9Nc,2958
 holado_python/tests/behave/steps/standard_library/multiprocessing_steps.py,sha256=uMiDMuIDfsVc5QVTJqUEqi4Rt9LutAUTqGsrm95JJyY,2498
 holado_python/tests/behave/steps/standard_library/queue_steps.py,sha256=sKpExnfOxDO7NXQGVFNVy9KY_lOVK-2EZtd5nEIEiUM,17408
-holado_python/tests/behave/steps/standard_library/socket_steps.py,sha256=xAGWZE0HcEidTxJJjIjofWYPY496kXArk-MxfCw8kOw,11389
-holado_python/tests/behave/steps/standard_library/ssl_steps.py,sha256=dfKYVcRPdOT5s9y8zh2Zd8nnzT-rt5k54Bfd6e80YSo,3245
+holado_python/tests/behave/steps/standard_library/socket_steps.py,sha256=VNzUOnCDY7RJVeBuzV46nRxvZnePKuRejXnjcep202k,11912
+holado_python/tests/behave/steps/standard_library/ssl_steps.py,sha256=06vlvf8cwfi4lQe6q3OyZUZIBvbgcl1-ItiT5v5-GjA,3256
 holado_rabbitmq/__init__.py,sha256=4QWQhcore0gjLpI72i3m9CZpNP4RyvT-qiNUdP6AkCU,1770
 holado_rabbitmq/tests/behave/steps/__init__.py,sha256=l-VWY2Qv9f-9ZoPmWjUmeurF8kayJCDMReHsCRwNwYc,1332
 holado_rabbitmq/tests/behave/steps/tools/rabbitmq_client_steps.py,sha256=H5_r6LKaw_ElmmjcghZMT5KQInoJrdYNOtATh8GG3MQ,28833
@@ -358,8 +358,9 @@ holado_scripting/tests/behave/steps/scenario/loop_steps.py,sha256=2D7knm_i8XzUuj
 holado_scripting/text/base/base_function.py,sha256=GX-xVt5dhPQipRkgJ5J9Un-0GhK1NOt_fMOrcs_THB8,1469
 holado_scripting/text/base/base_verify_function.py,sha256=7ivJ-Om9o5KB1pBoh4MU5UZYb40msHvnuEdgKK7EWdg,1494
 holado_scripting/text/base/text_inspecter.py,sha256=Hw7aU7vShmVRwPFcChhrm9rbTYHeUzokPTbUSxXGDJg,8981
-holado_scripting/text/interpreter/text_interpreter.py,sha256=KSz8VvTwdFJ6e9YYTwfgWSbK8P_twb4PKYgJHVm21y8,12215
+holado_scripting/text/interpreter/text_interpreter.py,sha256=qCjt23b7Q7ayoz-T1H_U_p301sTlggE6-dRP5rOp9kg,12596
 holado_scripting/text/interpreter/exceptions/interpreter_exception.py,sha256=hvfe1gExRlvsNLfUCghKJwYBdsjVFzqquBhx3J3aFTg,1611
+holado_scripting/text/interpreter/functions/function_apply_function.py,sha256=gNpLXIl-xecMIG9EOCJMO5hz0D6ceBqnjqhu2IZ6gvQ,3020
 holado_scripting/text/interpreter/functions/function_cast.py,sha256=EvOWrb949y6rqbf7gHnX-sId3gVmE1eduYWAq58tdg0,3033
 holado_scripting/text/interpreter/functions/function_convert.py,sha256=a2dYdKcMTKEQFr_ZbowTDcGYlMHB_0hGrAry0OKmfz8,2949
 holado_scripting/text/interpreter/functions/function_dynamic_value.py,sha256=zBnIsSWwYgXeiYsAYzjUds6V2ab85jDKUgE90JqKxsY,2230
@@ -370,6 +371,7 @@ holado_scripting/text/interpreter/functions/function_hex_to_int.py,sha256=LJQvYn
 holado_scripting/text/interpreter/functions/function_to_base_64.py,sha256=BfOmPN8xNUZl2uBjGWdKwy0oHuYWlhg7ws4_CK514g0,2197
 holado_scripting/text/interpreter/functions/function_to_bytes.py,sha256=EIEgzNKd5YC5uHf5VVFIsW4MVuLsgll9PwKBGSp9b7E,2577
 holado_scripting/text/interpreter/functions/function_to_hex.py,sha256=sETE1PeK1Yu3G3gjMdJT7KNUa-8g6wJBKNa-mZhSrq4,2439
+holado_scripting/text/interpreter/functions/function_to_string.py,sha256=InOdqtL7NMLyzUygLWhuMB2r7_Zrrndlu7onuQc9mhA,2579
 holado_scripting/text/verifier/text_verifier.py,sha256=fdQss_GOavE9WTFD1MQfBRrWVgLNJYeUE9wVJtsmvNA,4959
 holado_scripting/text/verifier/exceptions/verifier_exception.py,sha256=4zA5YnJ8IoLMAj32EIiaZUAidtazEKoCxyDYoZhBAGw,1459
 holado_scripting/text/verifier/functions/verify_function_extract_in.py,sha256=5T0PxObLzn5pl29QwrAfaIVWIzd-UkJRFM93njQfAZM,2047
@@ -412,7 +414,7 @@ holado_test/common/context/feature_context.py,sha256=GhC0lihnvTBhv5tE4JzPt39eP7g
 holado_test/common/context/scenario_context.py,sha256=pmo-xGtn6oHtbTmcH6Vtp8Dj2iGrYVdHd0b6smtlhbY,10527
 holado_test/common/context/step_context.py,sha256=j6S4ozTPrdlpV9Slopc998fYOV8KfMLAUSW4mcEFUI8,2383
 holado_test/common/exceptions/undefined_step_exception.py,sha256=SHHX22iz4Ip-V4Y3aM2EJFDt30CCS5EaauN6KB-JORo,1461
-holado_test/scenario/step_tools.py,sha256=GvxhVyGAeNZ9gz-24AIVnhJh6fFRQ2uHDZTGWQGCrA8,25463
+holado_test/scenario/step_tools.py,sha256=E4njtSDf11cD0ZMnNEUlIaqx5Xgzl6dLx5_YQcDodL8,25552
 holado_test/scenario/tester_tools.py,sha256=GB2AV_T1lluiNZtt5_cAhstEenhIeHC48x-hkK337Uk,2369
 holado_test/tests/behave/steps/__init__.py,sha256=rdqrp-UN7vRplIqORx4sXyKwMUkptRizyLWudsmYehM,1362
 holado_test/tests/behave/steps/scenario/exception_steps.py,sha256=ayMUmIJI4a7w95RL2NYiBWA8jSBwKyjdaRJL3IKdYQ0,4033
@@ -420,9 +422,9 @@ holado_test/tests/behave/steps/scenario/scenario_steps.py,sha256=TPLpatwXrY_Dd71
 holado_test/tests/behave/steps/scenario/tester_steps.py,sha256=4mJA6CjyHvQmRv7P_bt8k6SrTr_zrc4AetuSB35Wsow,2896
 holado_value/__init__.py,sha256=60VyLyWux76dFwn03uH4Fz3R6itf6fqKu0pQUdvwblU,1561
 holado_value/common/tables/value_table.py,sha256=fJgb-HWdlMwHOAx5CS38sPiVrjGelEiQBbG9HuHqe-A,1726
-holado_value/common/tables/value_table_cell.py,sha256=3W2AoDxpvcqH4_Ta4LxeZeaCLa9umhoYrtJtMmSWGFU,3139
+holado_value/common/tables/value_table_cell.py,sha256=vCL8uSTEKOpI9G5f0epgJMArFxQidfWTCRHBZbdrsjc,3344
 holado_value/common/tables/value_table_manager.py,sha256=1Q7V9RQyJrI5V7GfVcAn2MC_EZ494WeTgO7XvB7wtq8,3000
-holado_value/common/tables/value_table_row.py,sha256=8sX4qPyfoPCe1BvnwnlUyya2iKIr-K733erO9E9AnBc,2539
+holado_value/common/tables/value_table_row.py,sha256=tA8D5rMNBMa2JKumM9ST3qn-MyPrjomS0Fms67OwcyY,2482
 holado_value/common/tables/value_table_with_header.py,sha256=6uHR05tUD_EmPz-Qv8ul3kmQ55VjFKIj2G6jGkjXZyU,1763
 holado_value/common/tables/comparators/table_2_value_table_cell_comparator.py,sha256=gYYxEfey_xRp80VahqGF5N0RDIvT-NqCslTXTId_3Vw,10423
 holado_value/common/tables/comparators/table_2_value_table_comparator.py,sha256=rITxTgXami05plxk1qaCVqDcwZaKWoXpKAzur4ingTE,1807
@@ -430,7 +432,7 @@ holado_value/common/tables/comparators/table_2_value_table_row_comparator.py,sha
 holado_value/common/tables/comparators/table_2_value_table_with_header_comparator.py,sha256=VKwA7PbXnE-gFSKWlDCsJv0tkWVuNY-C4aWt2tyIybE,1911
 holado_value/common/tables/converters/value_table_converter.py,sha256=L0XIMxXv09fgcB6aJ8Wjg8FUw70PJ8A66ZBvBcA-P0o,9790
 holado_value/common/tools/unique_value_manager.py,sha256=UXKdDKWznp4auYKQeWB7zYEzfm_0GxAiGfyoFM5ZM3s,5223
-holado_value/common/tools/value.py,sha256=fWR_l12SEq47G3aMuRtsCz5ly_2HNdxIUluUokDaaE4,9022
+holado_value/common/tools/value.py,sha256=BwAx9L_xHA-v4K55osnXjI9z9bQn_MKQ8Cvk3mhqBjA,9108
 holado_value/common/tools/value_types.py,sha256=7nJp5D7xdoT9jMeeOxHIuPRykDyI9fXpve37ndK32gs,1801
 holado_value/tests/behave/steps/__init__.py,sha256=BHp8TYE_X4lWn4B8A51nXSYaJlczuiDVJLcKMy7p0Lw,1267
 holado_value/tests/behave/steps/private/__init__.py,sha256=BHp8TYE_X4lWn4B8A51nXSYaJlczuiDVJLcKMy7p0Lw,1267
@@ -465,8 +467,8 @@ test_holado/features/NonReg/holado_binary/bit_series.feature,sha256=_FS1JMDFtt3L
 test_holado/features/NonReg/holado_protobuf/protobuf.feature,sha256=5PjD4R_ow3lMwWNFuemGZ6J0_A2_pzn-oNY4aV-wsGg,11857
 test_holado/features/NonReg/holado_python/convert.feature,sha256=rVBWdy43UbWNfnBB_mENQwN6ArdcxJ5fN2C2nPKihhE,498
 test_holado/features/NonReg/holado_python/iterable.feature,sha256=dqdkCYM1xsWWOBowCpW7t6hG2ZBWHS4NqrFgfgcKp7Q,1574
-test_holado/features/NonReg/holado_python/standard_library/socket.feature,sha256=gNYfO4tkoSUGZo-iMzzEDN04FWZk8DBeh3ZN0t6pa94,3200
-test_holado/features/NonReg/holado_python/standard_library/socket_with_ssl.feature,sha256=zQzyi_M3lJDPMrwCS30buElDJ0qhPm7166NfbhSyYCw,7540
+test_holado/features/NonReg/holado_python/standard_library/socket.feature,sha256=qNncGlJCOGz_fad8QeLhToX743nZNZcEe--mjHbMg3I,5313
+test_holado/features/NonReg/holado_python/standard_library/socket_with_ssl.feature,sha256=FZRZVGlmRBvikX915R3AQ4GDVhOSGo-K2fFfM7wTPoo,10812
 test_holado/features/NonReg/holado_scripting/common/tools/dynamic_text_manager.feature,sha256=z4OEQ_Mk_XX58rStfWHpXWq07FKRgF43AcgRkOCxDhI,452
 test_holado/features/NonReg/holado_scripting/common/tools/expression_evaluator.feature,sha256=QBjeF-V_PjAXEog2npCspor9YMxEcW9pS0KgaKNVG8A,5396
 test_holado/features/NonReg/holado_scripting/common/tools/variable_manager.feature,sha256=EeGskI6KVgIPzfZvL-bncASwXcSKb6PDu1mRDcpd5vE,2006
@@ -530,7 +532,7 @@ test_holado/tools/django/api_rest/api_rest/api1/serializers.py,sha256=o_YxFr-tgC
 test_holado/tools/django/api_rest/api_rest/api1/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 test_holado/tools/django/api_rest/api_rest/api1/views.py,sha256=kOt2xT6bxO47_z__5yYR9kcYIWWv4qYzpX0K8Tqonik,758
 test_holado/tools/django/api_rest/api_rest/api1/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-holado-0.2.7.dist-info/METADATA,sha256=SvuQzxFGmfj6dmBW6Gpwr5vilZuKxFwgHACPmgLKDrI,5796
-holado-0.2.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-holado-0.2.7.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
-holado-0.2.7.dist-info/RECORD,,
+holado-0.2.8.dist-info/METADATA,sha256=r5NOLjSm0RPD6yvuN6OD-fLNRK1Wkxv2UD4QcHxXsUY,5903
+holado-0.2.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+holado-0.2.8.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
+holado-0.2.8.dist-info/RECORD,,

holado_core/common/tables/table.py

@@ -66,10 +66,10 @@ class Table(object):
         return result
     
     def __repr__(self)->str:
-        if self.nb_rows * self.nb_columns < 100:
+        if self.nb_rows < 10 or self.nb_rows * self.nb_columns < 100:
             return f"<{self.__class__.__name__}>({self.nb_rows}x{self.nb_columns})\n{self.represent()}"
         else:
-            return f"<{self.__class__.__name__}>({self.nb_rows}x{self.nb_columns})"
+            return f"<{self.__class__.__name__}>({self.nb_rows}x{self.nb_columns})\n{self.represent(limit_rows=10)}[...]"
     
     @property
     def content(self):

holado_core/common/tools/string_tools.py

@@ -131,5 +131,14 @@ class StrTools(object):
             res = res.upper()
         
         return res
+    
+    @classmethod
+    def to_string(cls, src):
+        if isinstance(src, bytes):
+            return src.decode('utf-8')
+        elif isinstance(src, str):
+            return src
+        else:
+            return str(src)
 
 

holado_core/tests/behave/steps/common/tables_steps.py

@@ -37,6 +37,7 @@ from holado_core.common.tools.converters.converter import Converter
 from holado_test.behave.scenario.behave_step_tools import BehaveStepTools
 from holado_value.common.tables.converters.value_table_converter import ValueTableConverter
 from holado_python.standard_library.typing import Typing
+from holado_value.common.tables.value_table_manager import ValueTableManager
 
 logger = logging.getLogger(__name__)
 
@@ -317,6 +318,7 @@ def step_impl(context, var_name, table_varname, col_name):
     col_name = StepTools.evaluate_scenario_parameter(col_name)
 
     res_table = copy.copy(table)
+    is_value_table = ValueTableManager.is_value_table(res_table)
     col = res_table.get_column(name=col_name)
     
     tr_indexes = table_replace.get_column_indexes_by_string_content()
@@ -328,8 +330,10 @@ def step_impl(context, var_name, table_varname, col_name):
             cell_rep_value = row_replace[tr_indexes["Replace Value"]] if "Replace Value" in tr_indexes else None
             
             if cell_cond_value is not None:
+                # If condition value is 'DEFAULT' or cell value is equal to condition value
                 cond = (cell_cond_value.content_type == ValueTypes.Symbol and cell_cond_value.content == 'DEFAULT'
-                        or cell_cond_value.value_type != ValueTypes.NotApplicable and cell.content == cell_cond_value.value)
+                        or cell_cond_value.value_type != ValueTypes.NotApplicable 
+                            and (is_value_table and cell.value == cell_cond_value.value or not is_value_table and cell.content == cell_cond_value.value) )
             elif cell_cond_expr is not None:
                 cond = tcell_comparator.equals(cell, cell_cond_expr, raise_exception = False)
             else:
@@ -339,7 +343,10 @@ def step_impl(context, var_name, table_varname, col_name):
                 if cell_rep_value.value_type != ValueTypes.NotApplicable:
                     # Note: As 'col' is created with a copy of 'res_table' cells, 'cell' is also a 'res_table' cell.
                     #       Thus, modifying 'cell' is modifying the cell in 'res_table'
-                    cell.content = cell_rep_value.value
+                    if is_value_table:
+                        cell.value = cell_rep_value.value
+                    else:
+                        cell.content = cell_rep_value.value
                     break
                 else:
                     continue

holado_helper/script/action.py

@@ -89,13 +89,22 @@ class BehaveActionRunner():
     
     def __add_variable_values(self, res, params):
         if params:
-            for key, value in params.items():
-                if key == 'STATUS':
-                    continue
-                if value is not_applicable:
-                    res[key] = 'N/A'
-                else:
-                    res[key] = value
+            if isinstance(params, dict):
+                for key, value in params.items():
+                    self.__add_variable_value(res, key, value)
+            elif isinstance(params, list):
+                for key, value in params:
+                    self.__add_variable_value(res, key, value)
+            else:
+                raise TechnicalException(f"Unexpected params type '{type(params)}'")
+    
+    def __add_variable_value(self, res, var_name, value):
+        if var_name == 'STATUS':
+            return
+        if value is not_applicable:
+            res[var_name] = 'N/A'
+        else:
+            res[var_name] = value
     
     def run(self):
         logger.info(f"Processing action '{self.__action_info.action}' of index {self.__action_info.index}: {self.__action_info.params}")

holado_python/standard_library/socket/blocking_socket.py

@@ -16,6 +16,8 @@ import socket
 from holado_python.standard_library.socket.socket import SocketClient, SocketServer
 import abc
 from holado_multitask.multithreading.loopfunctionthreaded import LoopFunctionThreaded
+import time
+from holado.common.handlers.undefined import undefined_argument
 
 logger = logging.getLogger(__name__)
 
@@ -31,17 +33,79 @@ class BlockingSocketClient(SocketClient):
     """
     __metaclass__ = abc.ABCMeta
     
-    def __init__(self, *, name=None, create_ipv4_socket_kwargs=None):
-        super().__init__(name=name, create_ipv4_socket_kwargs=create_ipv4_socket_kwargs)
+    def __init__(self, *, name=None, create_ipv4_socket_kwargs=None, idle_sleep_delay=undefined_argument, do_run_with_recv=True, do_run_with_send=True):
+        super().__init__(name=name, create_ipv4_socket_kwargs=create_ipv4_socket_kwargs, idle_sleep_delay=idle_sleep_delay, do_run_with_recv=do_run_with_recv, do_run_with_send=do_run_with_send)
     
+    def start(self, *, read_bufsize=1024, read_kwargs=None, write_kwargs=None):
+        """Start client event loop.
+        """
+        if self.is_with_ssl:
+            # Set a small timeout, so that recv has a behaviour similar flag MSG_DONTWAIT
+            # See _process_recv_send implementation, recv flags are needed to be forced to 0
+            if self._idle_sleep_delay is not None:
+                self.internal_socket.settimeout(self._idle_sleep_delay)
+            else:
+                self.internal_socket.settimeout(0.01)
+        
+        kwargs = {'read_bufsize':read_bufsize, 'read_kwargs':read_kwargs, 'write_kwargs':write_kwargs}
+        thread = LoopFunctionThreaded(self._process_recv_send, kwargs=kwargs, register_thread=True, delay_before_run_sec=None)
+        self._start_thread(thread)
+    
+    def _process_recv_send(self, *, read_bufsize=1024, read_kwargs=None, write_kwargs=None):
+        has_activity = False
+        read_kwargs = read_kwargs if read_kwargs is not None else {}
+        write_kwargs = write_kwargs if write_kwargs is not None else {}
+        
+        recv_data = None
+        if self.is_run_with_recv:
+            if self.is_with_ssl:
+                # ssl doesn't suppôrt flags != 0
+                flags = 0
+            else:
+                # Add flag to not wait data
+                flags = read_kwargs.get('flags', 0)
+                flags |= socket.MSG_DONTWAIT
+            
+            try:
+                recv_data = self.internal_socket.recv(read_bufsize, flags)
+            except (BlockingIOError, TimeoutError):
+                # No data to read
+                pass
+            else:
+                if recv_data:
+                    has_activity = True
+                    with self._data_lock:
+                        self._data.in_bytes += recv_data
+                        if logger.isEnabledFor(logging.DEBUG):
+                            logger.debug(f"[{self.name}] Received [{recv_data}] (type: {type(recv_data)} ; total: {len(self._data.in_bytes)})")
+        
+        sent = None
+        if self.is_run_with_send:
+            with self._data_lock:
+                if self._data.out_bytes:
+                    has_activity = True
+                    sent = self.internal_socket.send(self._data.out_bytes)
+                    if sent > 0:
+                        self._data.out_bytes = self._data.out_bytes[sent:]
+                        if logger.isEnabledFor(logging.DEBUG):
+                            logger.debug(f"[{self.name}] Sent {sent} data (remaining to send: {len(self._data.out_bytes)})")
+        
+        # Wait before next loop if no data was exchanged
+        if not has_activity and self._idle_sleep_delay is not None:
+            time.sleep(self._idle_sleep_delay)
+    
+    def do_ssl_handshake(self):
+        if self.is_with_ssl:
+            self.internal_socket.do_handshake()
+
 
 class TCPBlockingSocketClient(BlockingSocketClient):
     """
     TCP socket client.
     """
     
-    def __init__(self, *, name=None, create_ipv4_socket_kwargs=None):
-        super().__init__(name=name, create_ipv4_socket_kwargs=create_ipv4_socket_kwargs)
+    def __init__(self, *, name=None, create_ipv4_socket_kwargs=None, idle_sleep_delay=undefined_argument, do_run_with_recv=True, do_run_with_send=True):
+        super().__init__(name=name, create_ipv4_socket_kwargs=create_ipv4_socket_kwargs, idle_sleep_delay=idle_sleep_delay, do_run_with_recv=do_run_with_recv, do_run_with_send=do_run_with_send)
     
     def create_ipv4_socket(self, host, port, **kwargs):
         ssl_context, kwargs = self._new_ssl_context_if_required(**kwargs)
@@ -49,9 +113,12 @@ class TCPBlockingSocketClient(BlockingSocketClient):
         sock = socket.create_connection((host, port), **kwargs)
         
         if ssl_context:
-            sock = ssl_context.wrap_socket(sock, server_hostname=host, do_handshake_on_connect=False)
-            # sock = ssl_context.wrap_socket(sock, server_hostname=host)
-        self._set_internal_socket(sock)
+            # do_handshake_on_connect = True
+            do_handshake_on_connect = False
+            sock = ssl_context.wrap_socket(sock, server_hostname=host, do_handshake_on_connect=do_handshake_on_connect)
+            self._set_internal_socket(sock, is_with_ssl=True, is_ssl_handshake_done_on_connect=do_handshake_on_connect)
+        else:
+            self._set_internal_socket(sock)
 
 
 
@@ -67,24 +134,16 @@ class BlockingSocketServer(SocketServer):
     """
     __metaclass__ = abc.ABCMeta
     
-    def __init__(self, *, name=None, create_ipv4_socket_kwargs=None):
-        super().__init__(name=name, create_ipv4_socket_kwargs=create_ipv4_socket_kwargs)
-        
-        self.__start_thread = None
+    def __init__(self, *, name=None, create_ipv4_socket_kwargs=None, idle_sleep_delay=undefined_argument):
+        super().__init__(name=name, create_ipv4_socket_kwargs=create_ipv4_socket_kwargs, idle_sleep_delay=idle_sleep_delay)
     
     def start(self, read_bufsize=1024, *, read_kwargs=None, write_kwargs=None):
         """Start server to wait a connection, and then listen data, process data, and send result.
         Note: current implementation is simple and supports only one connection at a time.
         """
         kwargs = {'read_bufsize':read_bufsize, 'read_kwargs':read_kwargs, 'write_kwargs':write_kwargs}
-        self.__start_thread = LoopFunctionThreaded(self.wait_and_process_connection, kwargs=kwargs, register_thread=True, delay_before_run_sec=None)
-        self.__start_thread.start()
-    
-    def stop(self):
-        if self.__start_thread is not None:
-            self.__start_thread.interrupt()
-            self.__start_thread.join()
-            self.__start_thread = None
+        thread = LoopFunctionThreaded(self.wait_and_process_connection, kwargs=kwargs, register_thread=True, delay_before_run_sec=None)
+        self._start_thread(thread)
     
     def wait_and_process_connection(self, read_bufsize=1024, *, read_kwargs=None, write_kwargs=None):
         """Wait a connection, and then listen data, process data, and send result.
@@ -104,15 +163,11 @@ class BlockingSocketServer(SocketServer):
                     
                 if not data:
                     break
-                result = self._process_data(data)
+                result = self._process_received_data(data)
                 
                 if logger.isEnabledFor(logging.DEBUG):
                     logger.debug(f"[{self.name}] Sending: {result}")
                 conn.write(result, **write_kwargs)
-    
-    @abc.abstractmethod
-    def _process_data(self, data):
-        raise NotImplementedError()
 
 
 
@@ -121,8 +176,8 @@ class TCPBlockingSocketServer(BlockingSocketServer):
     TCP socket server
     """
     
-    def __init__(self, *, name=None, create_ipv4_socket_kwargs=None):
-        super().__init__(name=name, create_ipv4_socket_kwargs=create_ipv4_socket_kwargs)
+    def __init__(self, *, name=None, create_ipv4_socket_kwargs=None, idle_sleep_delay=undefined_argument):
+        super().__init__(name=name, create_ipv4_socket_kwargs=create_ipv4_socket_kwargs, idle_sleep_delay=idle_sleep_delay)
     
     def create_ipv4_socket(self, host, port, **kwargs):
         ssl_context, kwargs = self._new_ssl_context_if_required(server_side=True, **kwargs)
@@ -130,7 +185,9 @@ class TCPBlockingSocketServer(BlockingSocketServer):
         sock = socket.create_server((host, port), **kwargs)
         
         if ssl_context:
-            # sock = ssl_context.wrap_socket(sock, do_handshake_on_connect=False, server_side=True)
-            sock = ssl_context.wrap_socket(sock, server_side=True)
-        self._set_internal_socket(sock)
+            do_handshake_on_connect = True
+            sock = ssl_context.wrap_socket(sock, server_side=True, do_handshake_on_connect=do_handshake_on_connect)
+            self._set_internal_socket(sock, is_with_ssl=True, is_ssl_handshake_done_on_connect=do_handshake_on_connect)
+        else:
+            self._set_internal_socket(sock)
 

holado_python/standard_library/socket/echo_server.py

@@ -13,16 +13,17 @@
 
 import logging
 from holado_python.standard_library.socket.blocking_socket import TCPBlockingSocketServer
+from holado.common.handlers.undefined import undefined_argument
 
 logger = logging.getLogger(__name__)
 
 
 
 class EchoTCPBlockingSocketServer(TCPBlockingSocketServer):
-    def __init__(self, *, name=None, create_ipv4_socket_kwargs=None):
-        super().__init__(name=name, create_ipv4_socket_kwargs=create_ipv4_socket_kwargs)
+    def __init__(self, *, name=None, create_ipv4_socket_kwargs=None, idle_sleep_delay=undefined_argument):
+        super().__init__(name=name, create_ipv4_socket_kwargs=create_ipv4_socket_kwargs, idle_sleep_delay=idle_sleep_delay)
     
-    def _process_data(self, data):
+    def _process_received_data(self, data):
         return data
 
 

holado_python/standard_library/socket/message_socket.py

@@ -17,6 +17,9 @@ import selectors
 from holado_python.standard_library.socket.non_blocking_socket import TCPNonBlockingSocketClient
 import copy
 import threading
+from holado_python.standard_library.socket.blocking_socket import TCPBlockingSocketClient
+from holado_core.common.tools.tools import Tools
+from holado.common.handlers.undefined import undefined_argument
 
 logger = logging.getLogger(__name__)
 
@@ -26,14 +29,14 @@ logger = logging.getLogger(__name__)
 ##########################################################################
 
 
-class MessageTCPSocketClient(TCPNonBlockingSocketClient):
+class MessageSocketClient(object):
     """
-    Base class for blocking socket client.
+    Base class for message socket client.
     """
     __metaclass__ = abc.ABCMeta
     
-    def __init__(self, separator=b'\n', *, name=None, create_ipv4_socket_kwargs=None):
-        super().__init__(name=name, create_ipv4_socket_kwargs=create_ipv4_socket_kwargs)
+    def __init__(self, separator=b'\n'):
+        super().__init__()
         
         self.__separator = separator
         self.__messages_lock = threading.Lock()
@@ -47,23 +50,21 @@ class MessageTCPSocketClient(TCPNonBlockingSocketClient):
     def nb_messages(self):
         return len(self.__messages)
     
-    def _service_connection(self, key, mask, *, read_bufsize=1024, read_kwargs=None, write_kwargs=None):
-        # Read from socket & write in socket
-        super()._service_connection(key, mask, read_bufsize=read_bufsize, read_kwargs=read_kwargs, write_kwargs=write_kwargs)
+    def _extract_messages_from_data(self, data):
+        while True:
+            ind = data.in_bytes.find(self.__separator)
+            if ind >=0:
+                msg = data.in_bytes[:ind]
+                self._add_message(msg)
+                data.in_bytes = data.in_bytes[ind+len(self.__separator):]
+                if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
+                    logger.trace(f"[{self.name}] New message (total: {self.nb_messages}): {msg}")
+                elif Tools.do_log(logger, logging.DEBUG):
+                    logger.debug(f"[{self.name}] New message (total: {self.nb_messages})")
+            else:
+                break
         
-        # Extract messages from received data
-        if mask & selectors.EVENT_READ:
-            with self._data_lock:
-                while True:
-                    ind = self._data.in_bytes.find(self.__separator)
-                    if ind >=0:
-                        msg = self._data.in_bytes[:ind]
-                        self.__add_message(msg)
-                        self._data.in_bytes = self._data.in_bytes[ind+len(self.__separator):]
-                    else:
-                        break
-    
-    def __add_message(self, msg):
+    def _add_message(self, msg):
         with self.__messages_lock:
             self.__messages.append(msg)
     
@@ -85,6 +86,44 @@ class MessageTCPSocketClient(TCPNonBlockingSocketClient):
 
 
 
+class MessageTCPBlockingSocketClient(TCPBlockingSocketClient, MessageSocketClient):
+    """
+    Message socket client with TCP blocking socket.
+    """
+    def __init__(self, separator=b'\n', *, name=None, create_ipv4_socket_kwargs=None, idle_sleep_delay=undefined_argument):
+        MessageSocketClient.__init__(self, separator)
+        TCPBlockingSocketClient.__init__(self, name=name, create_ipv4_socket_kwargs=create_ipv4_socket_kwargs, idle_sleep_delay=idle_sleep_delay)
+
+    def _process_recv_send(self, *, read_bufsize=1024, read_kwargs=None, write_kwargs=None):
+        # Read from socket & write in socket
+        super()._process_recv_send(read_bufsize=read_bufsize, read_kwargs=read_kwargs, write_kwargs=write_kwargs)
+        
+        # Extract messages from received data
+        if self.is_run_with_recv:
+            with self._data_lock:
+                self._extract_messages_from_data(self._data)
+
+
+
+class MessageTCPNonBlockingSocketClient(TCPNonBlockingSocketClient, MessageSocketClient):
+    """
+    Message socket client with TCP non-blocking socket.
+    """
+    def __init__(self, separator=b'\n', *, name=None, create_ipv4_socket_kwargs=None, idle_sleep_delay=undefined_argument):
+        MessageSocketClient.__init__(self, separator)
+        TCPNonBlockingSocketClient.__init__(self, name=name, create_ipv4_socket_kwargs=create_ipv4_socket_kwargs, idle_sleep_delay=idle_sleep_delay)
+
+    def _service_connection(self, key, mask, *, read_bufsize=1024, read_kwargs=None, write_kwargs=None):
+        # Read from socket & write in socket
+        super()._service_connection(key, mask, read_bufsize=read_bufsize, read_kwargs=read_kwargs, write_kwargs=write_kwargs)
+        
+        # Extract messages from received data
+        if mask & selectors.EVENT_READ:
+            with self._data_lock:
+                self._extract_messages_from_data(self._data)
+
+
+