diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-10-20 14:36:19 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-10-20 14:36:27 -0500 |
| commit | 8db0af5fa8c3455aa816cfce0a07e3ad790307b7 (patch) | |
| tree | faee0e76b36d40ed8768ba59b1860748debec256 /src/lib/Bcfg2 | |
| parent | 490bf6eb8f590ba2c983347ce10cd3f2ed9b5158 (diff) | |
| download | bcfg2-8db0af5fa8c3455aa816cfce0a07e3ad790307b7.tar.gz bcfg2-8db0af5fa8c3455aa816cfce0a07e3ad790307b7.tar.bz2 bcfg2-8db0af5fa8c3455aa816cfce0a07e3ad790307b7.zip | |
removed python 2.6-ism
Diffstat (limited to 'src/lib/Bcfg2')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/File.py | 4 |
1 files changed, 2 insertions, 2 deletions
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, |