Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tristan Cavelier
erp5
Commits
150de840
Commit
150de840
authored
8 years ago
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xxx workaround 5 part
parent
6892d346
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
4 deletions
+12
-4
product/ERP5OOo/Document/OOoDocument.py
product/ERP5OOo/Document/OOoDocument.py
+12
-4
No files found.
product/ERP5OOo/Document/OOoDocument.py
View file @
150de840
...
@@ -112,12 +112,20 @@ class OOoServerProxy(ServerProxy):
...
@@ -112,12 +112,20 @@ class OOoServerProxy(ServerProxy):
transport
=
TimeoutTransport
(
timeout
=
timeout
,
scheme
=
scheme
)
transport
=
TimeoutTransport
(
timeout
=
timeout
,
scheme
=
scheme
)
#ServerProxy.__init__(self, uri, allow_none=True, transport=transport)
#ServerProxy.__init__(self, uri, allow_none=True, transport=transport)
from
xmlrpclib
import
SafeTransport
from
xmlrpclib
import
SafeTransport
import
ssl
import
ssl
host
=
"[2001:67c:1254:9c::e1f]:8000"
# cloudooo3 - CloudoooTest
uri
=
getattr
(
preference_tool
,
"getPreferredDocumentConversionServerUrl"
,
str
)()
#uri = "https://[2001:67c:1254:9c::e1f]:8000" # cloudooo3 - CloudoooTest
if
uri
.
startswith
(
"https://"
):
ssl_context
=
ssl
.
SSLContext
(
ssl
.
PROTOCOL_SSLv23
)
# allow invalid/autosigned certs
ssl_context
=
ssl
.
SSLContext
(
ssl
.
PROTOCOL_SSLv23
)
# allow invalid/autosigned certs
ssl_context
.
verify_mode
=
ssl
.
CERT_NONE
ssl_context
.
verify_mode
=
ssl
.
CERT_NONE
ServerProxy
.
__init__
(
self
,
"https://"
+
host
,
allow_none
=
True
,
transport
=
SafeTransport
(
context
=
ssl_context
))
ServerProxy
.
__init__
(
self
,
uri
,
allow_none
=
True
,
transport
=
SafeTransport
(
context
=
ssl_context
))
elif
uri
.
startswith
(
"http://"
):
ServerProxy
.
__init__
(
self
,
uri
,
allow_none
=
True
)
else
:
raise
ConversionError
(
'OOoDocument: cannot proceed with conversion:'
' preferred conversion server url is invalid'
)
def
__getattr__
(
self
,
attr
):
def
__getattr__
(
self
,
attr
):
obj
=
ServerProxy
.
__getattr__
(
self
,
attr
)
obj
=
ServerProxy
.
__getattr__
(
self
,
attr
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment