From cdf5b87807ea00dc619f01ccc9d37783317ca621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 23 Jun 2021 15:40:35 +0300 Subject: [PATCH] Add import calculate.contrib for suds --- pym/console/application/cl_client.py | 3 +-- pym/console/application/client_class.py | 8 +------- pym/console/application/function.py | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/pym/console/application/cl_client.py b/pym/console/application/cl_client.py index 76bd081..3037267 100644 --- a/pym/console/application/cl_client.py +++ b/pym/console/application/cl_client.py @@ -16,9 +16,8 @@ from calculate.core.server.local_call import Display, Methods, has_force_arg from calculate.lib.utils.tools import unpack_single_opts -# from sudsds import WebFault +import calculate.contrib from suds import WebFault -# from sudsds.transport import TransportError from suds.transport import TransportError from client_class import Client_suds import traceback as tb diff --git a/pym/console/application/client_class.py b/pym/console/application/client_class.py index fc4511d..006a4f6 100644 --- a/pym/console/application/client_class.py +++ b/pym/console/application/client_class.py @@ -27,13 +27,9 @@ import hashlib import M2Crypto from calculate.core.datavars import DataVarsCore from calculate.lib.datavars import DataVars -# from sudsds.client import Client +import calculate.contrib from suds.client import Client from cert_verify import verify, get_CRL -# from sudsds.transport.http import (HttpTransport, SUDSHTTPRedirectHandler, -# CheckingHTTPSConnection, -# CheckingHTTPSHandler, -# PYOPENSSL_AVAILABLE, PyOpenSSLSocket) import httplib from suds.transport.http import HttpTransport try: @@ -42,8 +38,6 @@ except ImportError: PYOPENSSL_AVAILABLE = False else: PYOPENSSL_AVAILABLE = True -# from sudsds.transport import Transport -# from sudsds.properties import Unskin from suds.transport import Transport from suds.properties import Unskin diff --git a/pym/console/application/function.py b/pym/console/application/function.py index 1561795..b215565 100644 --- a/pym/console/application/function.py +++ b/pym/console/application/function.py @@ -27,7 +27,7 @@ from calculate.core.server.cert_cmd import getHwAddr, getIpLocal from calculate.core.server.local_call import print_brief_group from calculate.lib.cl_lang import setLocalTranslate from calculate.lib.utils.files import readFile -# from sudsds import MethodNotFound +import calculate.contrib from suds import MethodNotFound _ = lambda x: x setLocalTranslate('cl_console3', sys.modules[__name__])