summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/BuiltinCore.py
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-04-10 10:29:35 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-04-10 10:29:35 -0500
commitc313bf1d75ae4fa885cd099f299177d84dd8a95d (patch)
tree151ec1345a0527a0008d583c586ea0fea9f74ec8 /src/lib/Bcfg2/Server/BuiltinCore.py
parent2cb245f4ebf5dbd37f11f02a7d1598b050799515 (diff)
downloadbcfg2-c313bf1d75ae4fa885cd099f299177d84dd8a95d.tar.gz
bcfg2-c313bf1d75ae4fa885cd099f299177d84dd8a95d.tar.bz2
bcfg2-c313bf1d75ae4fa885cd099f299177d84dd8a95d.zip
PY3K: Fix client/server to work with python 3
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Bcfg2/Server/BuiltinCore.py')
-rw-r--r--src/lib/Bcfg2/Server/BuiltinCore.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/BuiltinCore.py b/src/lib/Bcfg2/Server/BuiltinCore.py
index 4d7453840..35ebc9fe6 100644
--- a/src/lib/Bcfg2/Server/BuiltinCore.py
+++ b/src/lib/Bcfg2/Server/BuiltinCore.py
@@ -12,7 +12,7 @@ from Bcfg2.SSLServer import XMLRPCServer
from lockfile import LockFailed
# pylint: disable=E0611
try:
- from daemon.pidfile import PIDLockFile
+ from lockfile.pidlockfile import PIDLockFile
except ImportError:
from daemon.pidlockfile import PIDLockFile
# pylint: enable=E0611