From 73e3a6fff48a84a7c109d4f6d16abb30c0104804 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Wed, 28 Feb 2007 11:10:22 +0000 Subject: [PATCH] Use and..or as a ternary operator rather than a dictionary Signed-off-by: Catalin Marinas --- stgit/gitmergeonefile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stgit/gitmergeonefile.py b/stgit/gitmergeonefile.py index 3a55195..6f4c1d7 100644 --- a/stgit/gitmergeonefile.py +++ b/stgit/gitmergeonefile.py @@ -134,7 +134,7 @@ def interactive_merge(filename): mtime = os.path.getmtime(filename) print 'Trying the interractive %s merge' % \ - {True: 'three-way', False: 'two-way'}[three_way] + (three_way and 'three-way' or 'two-way') err = os.system(imerger % files_dict) if err != 0: -- 2.11.0