From 41158044eb9d7abdd2ba7a1d127bb26e34ef1630 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Wed, 10 Jun 2015 23:35:51 +0200 Subject: Put the most common case first in _make_and(). Measured with line_profiler on the x86 Kconfigs. --- kconfiglib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kconfiglib.py b/kconfiglib.py index 281cded..522b99d 100644 --- a/kconfiglib.py +++ b/kconfiglib.py @@ -3189,12 +3189,12 @@ def _make_and(e1, e2): Nones equate to 'y'. Note: returns None if e1 == e2 == None.""" - if e1 == "n" or e2 == "n": - return "n" if e1 is None or e1 == "y": return e2 if e2 is None or e2 == "y": return e1 + if e1 == "n" or e2 == "n": + return "n" # Prefer to merge/update argument list if possible instead of creating # a new AND node -- cgit v1.2.3