Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cloudooo
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tristan Cavelier
cloudooo
Commits
3241978a
Commit
3241978a
authored
Jun 15, 2015
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
follow API changes of psutil-3.0.0.
parent
1702db02
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
cloudooo/handler/ooo/application/application.py
cloudooo/handler/ooo/application/application.py
+1
-1
cloudooo/handler/ooo/application/openoffice.py
cloudooo/handler/ooo/application/openoffice.py
+1
-1
setup.py
setup.py
+1
-1
No files found.
cloudooo/handler/ooo/application/application.py
View file @
3241978a
...
@@ -87,7 +87,7 @@ class Application(object):
...
@@ -87,7 +87,7 @@ class Application(object):
try
:
try
:
for
connection
in
process
.
connections
():
for
connection
in
process
.
connections
():
if
connection
.
status
==
'LISTEN'
and
\
if
connection
.
status
==
'LISTEN'
and
\
connection
.
l
ocal_address
[
1
]
==
self
.
port
:
connection
.
l
addr
[
1
]
==
self
.
port
:
return
True
return
True
except
AccessDenied
:
except
AccessDenied
:
return
False
return
False
...
...
cloudooo/handler/ooo/application/openoffice.py
View file @
3241978a
...
@@ -120,7 +120,7 @@ class OpenOffice(Application):
...
@@ -120,7 +120,7 @@ class OpenOffice(Application):
if
process
.
exe
()
==
join
(
self
.
office_binary_path
,
self
.
_bin_soffice
):
if
process
.
exe
()
==
join
(
self
.
office_binary_path
,
self
.
_bin_soffice
):
for
connection
in
process
.
connections
():
for
connection
in
process
.
connections
():
if
connection
.
status
==
"LISTEN"
and
\
if
connection
.
status
==
"LISTEN"
and
\
connection
.
l
ocal_address
[
1
]
==
self
.
port
:
connection
.
l
addr
[
1
]
==
self
.
port
:
process
.
terminate
()
process
.
terminate
()
except
AccessDenied
,
e
:
except
AccessDenied
,
e
:
pass
pass
...
...
setup.py
View file @
3241978a
...
@@ -14,7 +14,7 @@ install_requires = [
...
@@ -14,7 +14,7 @@ install_requires = [
'PasteDeploy'
,
'PasteDeploy'
,
'PasteScript'
,
'PasteScript'
,
'WSGIUtils'
,
'WSGIUtils'
,
'psutil>=
2
.0.0'
,
'psutil>=
3
.0.0'
,
'lxml'
,
'lxml'
,
'python-magic'
,
'python-magic'
,
'argparse'
,
'argparse'
,
...
...
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