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
Kirill Smelkov
cloudooo
Commits
5c67568c
Commit
5c67568c
authored
Jun 05, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
'from psutil import error' instead of 'psutil.error'
to support psutil-0.7.1.
parent
a9e11c18
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
cloudooo/handler/ooo/application/openoffice.py
cloudooo/handler/ooo/application/openoffice.py
+2
-1
No files found.
cloudooo/handler/ooo/application/openoffice.py
View file @
5c67568c
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
import
pkg_resources
import
pkg_resources
import
psutil
import
psutil
from
psutil
import
error
from
os.path
import
exists
,
join
from
os.path
import
exists
,
join
from
subprocess
import
Popen
,
PIPE
from
subprocess
import
Popen
,
PIPE
from
threading
import
Lock
from
threading
import
Lock
...
@@ -121,7 +122,7 @@ class OpenOffice(Application):
...
@@ -121,7 +122,7 @@ class OpenOffice(Application):
if
connection
.
status
==
"LISTEN"
and
\
if
connection
.
status
==
"LISTEN"
and
\
connection
.
local_address
[
1
]
==
self
.
port
:
connection
.
local_address
[
1
]
==
self
.
port
:
process
.
terminate
()
process
.
terminate
()
except
psutil
.
error
.
AccessDenied
,
e
:
except
error
.
AccessDenied
,
e
:
pass
pass
except
TypeError
,
e
:
except
TypeError
,
e
:
# exception to prevent one psutil issue with zombie processes
# exception to prevent one psutil issue with zombie processes
...
...
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