Commit 5c67568c authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

'from psutil import error' instead of 'psutil.error'

to support psutil-0.7.1.
parent a9e11c18
...@@ -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
......
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