From 8db0af5fa8c3455aa816cfce0a07e3ad790307b7 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 20 Oct 2014 14:36:19 -0500 Subject: removed python 2.6-ism --- src/lib/Bcfg2/Client/Tools/POSIX/File.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/File.py b/src/lib/Bcfg2/Client/Tools/POSIX/File.py index 0452ea258..80e2f6cfd 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py @@ -220,8 +220,8 @@ class POSIXFile(POSIXTool): def _diff(self, content1, content2, filename=None): """ Return a unified diff of the two strings """ - fromfile = "%s (on disk)" % filename if filename else "" - tofile = "%s (from bcfg2)" % filename if filename else "" + fromfile = "%s (on disk)" % (filename or "") + tofile = "%s (from bcfg2)" % (filename or "") return difflib.unified_diff(content1.split('\n'), content2.split('\n'), fromfile=fromfile, -- cgit v1.2.3-1-g7c22