Add import calculate.contrib for spyne

pym/core/client/cert_func.py

@@ -98,7 +98,6 @@ def client_post_request(cert_path, by_host):
         return 1
     url = "https://%s:%d/?wsdl" % (by_host, port)
     print url + '\n' + _("connecting...")
-    # from sudsds.client import Client
     from suds.client import Client
     # try:
     client = Client(url, transport=HTTPSClientCertTransport(None, None,
@@ -153,7 +152,6 @@ def client_get_cert(cert_path, args):
     url = "https://%s:%d/?wsdl" % (args.from_host, port)
     print url + '\n' + _("connecting...")
 
-    # from sudsds.client import Client
     from suds.client import Client
 
     try:

pym/core/client/cert_info.py

@@ -14,8 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-# from sudsds import WebFault
-# from sudsds.transport import TransportError
+import calculate.contrib
 from suds.transport import TransportError
 from suds import WebFault
 import logging

pym/core/client/client_class.py

@@ -17,7 +17,7 @@
 import urllib2 as u2
 import os
 import sys
-# from sudsds.transport.http import HttpTransport
+import calculate.contrib
 from suds.transport.http import HttpTransport
 import httplib #http.client in python3
 from httplib import HTTPConnection
@@ -27,7 +27,6 @@ import hashlib
 from calculate.core.datavars import DataVarsCore
 from calculate.lib.datavars import DataVars
 from calculate.lib.utils.files import readFile
-# from sudsds.client import Client
 from suds.client import Client
 from cert_verify import verify, get_CRL
 

pym/core/client/function.py

@@ -16,7 +16,7 @@
 
 import os
 import sys
-# import sudsds
+import calculate.contrib
 from suds import MethodNotFound
 from calculate.core.server.cert_cmd import getHwAddr, getIpLocal
 _ = lambda x: x

pym/core/server/api_types.py

@@ -16,6 +16,7 @@
 
 from calculate.core.server.loaded_methods import LoadedMethods
 
+import calculate.contrib
 from spyne import String, Integer, Boolean
 from spyne.model.primitive import string_encoding
 from spyne import Array, ComplexModel

pym/core/server/baseClass.py

@@ -17,6 +17,7 @@
 import os
 import sys
 
+import calculate.contrib
 from spyne import rpc
 from spyne import Service
 from spyne import String, Integer, Array

pym/core/server/cert_cmd.py

@@ -170,7 +170,7 @@ def check_server_certificate(cert, key, cert_path, args, port, auto=False):
     elif args.host:
         url = "https://%s:%d/?wsdl" % (args.host, port)
         print url + '\n' + _("connecting...")
-        # from sudsds.client import Client
+        import calculate.contrib
         from suds.client import Client
         from client_class import HTTPSClientsCertTransport
         from urllib2 import URLError
@@ -217,7 +217,7 @@ def check_server_certificate(cert, key, cert_path, args, port, auto=False):
         url = "https://%s:%d/?wsdl" % (args.root_host, port)
         print url + '\n' + _("connecting...")
 
-        # from sudsds.client import Client
+        import calculate.contrib
         from suds.client import Client
         from client_class import HTTPSClientsCertTransport
 

pym/core/server/cl_server.py

@@ -23,6 +23,7 @@ from calculate.core.server.func import clearDataVars
 
 from calculate.lib.cl_lang import setLocalTranslate
 
+import calculate.contrib
 # from spyne.protocol.http import HttpRpc
 # from spyne.protocol.xml import XmlDocument
 # from spyne.protocol.json import JsonDocument

pym/core/server/client_class.py

@@ -17,7 +17,7 @@
 import urllib2 as u2
 import os
 import sys
-# from sudsds.transport.http import HttpTransport
+import calculate.contrib
 from suds.transport.http import HttpTransport
 from httplib import HTTPConnection, HTTPSConnection
 import socket

pym/core/server/core_interfaces.py

@@ -14,6 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 from calculate.lib.datavars import DataVars
+import calculate.contrib
 from spyne import Service
 
 class CoreServiceInterface(object):

pym/core/server/func.py

@@ -43,6 +43,7 @@ from calculate.lib.datavars import DataVarsError, CriticalError, Variable
 from calculate.lib.utils.content import getCfgFiles
 from itertools import *
 
+import calculate.contrib
 from spyne import String, Integer, Boolean, Array
 
 from calculate.core.server.api_types import ReturnedMessage, CommonInfo

pym/core/server/spyne_adapter.py

@@ -1,3 +1,20 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2021 Mir Calculate. http://www.calculate-linux.org
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+import calculate.contrib
 from spyne.service import Service, ServiceMeta
 from spyne import String, Integer, Array, rpc
 from func import WsdlMeta
@@ -85,4 +102,4 @@ def make_service(basic_class, wsdl_core_class_list, outer_wsdl_class_list, servi
 	#TODO replace with a single ref
 	ServiceMetaAdapter.global_class_ref = ClService
 	basic_class.set_comb_class_ref(ClService)
-	return ClService
+	return ClService