Deluge
diff options
Diffstat (limited to 'deluge/core/daemon.py')
| -rw-r--r-- | deluge/core/daemon.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/deluge/core/daemon.py b/deluge/core/daemon.py index 3c2ac643b..0185dd8cb 100644 --- a/deluge/core/daemon.py +++ b/deluge/core/daemon.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Copyright (C) 2007-2009 Andrew Resch <andrewresch@gmail.com> # @@ -8,8 +7,6 @@ # """The Deluge daemon""" -from __future__ import unicode_literals - import logging import os import socket @@ -44,8 +41,8 @@ def is_daemon_running(pid_file): try: with open(pid_file) as _file: - pid, port = [int(x) for x in _file.readline().strip().split(';')] - except (EnvironmentError, ValueError): + pid, port = (int(x) for x in _file.readline().strip().split(';')) + except (OSError, ValueError): return False if is_process_running(pid): @@ -53,7 +50,7 @@ def is_daemon_running(pid_file): _socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) try: _socket.connect(('127.0.0.1', port)) - except socket.error: + except OSError: # Can't connect, so pid is not a deluged process. return False else: @@ -62,7 +59,7 @@ def is_daemon_running(pid_file): return True -class Daemon(object): +class Daemon: """The Deluge Daemon class""" def __init__( @@ -156,7 +153,7 @@ class Daemon(object): pid = os.getpid() log.debug('Storing pid %s & port %s in: %s', pid, self.port, self.pid_file) with open(self.pid_file, 'w') as _file: - _file.write('%s;%s\n' % (pid, self.port)) + _file.write(f'{pid};{self.port}\n') component.start() |