opendev/statusbot
Code Issues Proposed changes

Explicitly handle ImportError for pid_file_module

Browse Source 
Change-Id: Ide9f386a1819b5111d54a75231ff996179f43ecb
This commit is contained in:
Dolph Mathews 2015-10-12 19:24:17 +00:00
parent d58d5456c7
commit 6ba0de29a5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
statusbot/bot.py
View File

@ -52,13 +52,11 @@ import ssl
import urllib import urllib
try: try:
import daemon.pidlockfile import daemon.pidlockfile as pid_file_module
pid_file_module = daemon.pidlockfile except ImportError:
except:
# as of python-daemon 1.6 it doesn't bundle pidlockfile anymore # as of python-daemon 1.6 it doesn't bundle pidlockfile anymore
# instead it depends on lockfile-0.9.1 # instead it depends on lockfile-0.9.1
import daemon.pidfile import daemon.pidfile as pid_file_module
pid_file_module = daemon.pidfile
# https://bitbucket.org/jaraco/irc/issue/34/ # https://bitbucket.org/jaraco/irc/issue/34/