Commit 93355d3c authored by Arnaud Fontaine's avatar Arnaud Fontaine Committed by Xiaowu Zhang

Since SOAPpy 0.12.1, wstools is not bundled directly.

SOAPpy.wstools import was working with python2 (and no longer with python3)
because SOAPpy __init__ imported wstools but this was right anyway...
parent af2750b8
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
############################################################################## ##############################################################################
import SOAPpy import SOAPpy
import wstools
from Products.AGProjects.patches import SOAPpy_WSDL as WSDL from Products.AGProjects.patches import SOAPpy_WSDL as WSDL
from AccessControl.SecurityInfo import allow_class from AccessControl.SecurityInfo import allow_class
import threading import threading
...@@ -163,7 +164,7 @@ class MethodWrapper(object): ...@@ -163,7 +164,7 @@ class MethodWrapper(object):
# Be on the safe side by using threading.local as a storage for it. # Be on the safe side by using threading.local as a storage for it.
wsdl_cache = threading.local() wsdl_cache = threading.local()
# XXX: SOAPpy.wstools.WSDLTools.WSDL.__del__ calls unlink on an xml document # XXX: wstools.WSDLTools.WSDL.__del__ calls unlink on an xml document
# instance, which happens to fail (AttributeError: NoneType has no attribute # instance, which happens to fail (AttributeError: NoneType has no attribute
# 'unlink') somewhere down in xml module. As that unlink is only acting on xml # 'unlink') somewhere down in xml module. As that unlink is only acting on xml
# nodes in memory, it's safe to ignore it. # nodes in memory, it's safe to ignore it.
...@@ -174,7 +175,8 @@ def WSDL___del__(self): ...@@ -174,7 +175,8 @@ def WSDL___del__(self):
unlink() unlink()
except AttributeError: except AttributeError:
pass pass
SOAPpy.wstools.WSDLTools.WSDL.__del__ = WSDL___del__
wstools.WSDLTools.WSDL.__del__ = WSDL___del__
class SOAPWSDLConnection: class SOAPWSDLConnection:
""" """
...@@ -212,7 +214,7 @@ class SOAPWSDLConnection: ...@@ -212,7 +214,7 @@ class SOAPWSDLConnection:
try: try:
wsdl = wsdl_cache.parsed wsdl = wsdl_cache.parsed
except AttributeError: except AttributeError:
wsdl = wsdl_cache.parsed = SOAPpy.wstools.WSDLTools.WSDLReader().loadFromURL(self.url) wsdl = wsdl_cache.parsed = wstools.WSDLTools.WSDLReader().loadFromURL(self.url)
# TODO: transport (http) level authentication using self._user_name and # TODO: transport (http) level authentication using self._user_name and
# self._password # self._password
return WSDLConnection(wsdl, self._credentials, self._service) return WSDLConnection(wsdl, self._credentials, self._service)
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
import weakref import weakref
from SOAPpy.wstools import WSDLTools from wstools import WSDLTools
from SOAPpy.Client import SOAPProxy from SOAPpy.Client import SOAPProxy
from SOAPpy.Types import headerType, faultType from SOAPpy.Types import headerType, faultType
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment