cleanup

diff --git a/Cython/Compiler/Optimize.py b/Cython/Compiler/Optimize.py
index 7fa1a9d02ab748df126d66e8f3b82e78a437e78b..0efb23f1cbd982967513fa878c3d79fdd7d45825 100644 (file)
--- a/Cython/Compiler/Optimize.py
+++ b/Cython/Compiler/Optimize.py
@@ -526,12 +526,12 @@ class SwitchTransform(Visitor.VisitorTransform):
             if is_common_value(cond.operand1, cond.operand1):
                 if cond.operand2.is_literal:
                     return cond.operand1, [cond.operand2]
-                elif hasattr(cond.operand2, 'entry') and cond.operand2.entry and cond.operand2.entry.is_const:
+                elif getattr(cond.operand2, 'entry', None) and cond.operand2.entry.is_const:
                     return cond.operand1, [cond.operand2]
             if is_common_value(cond.operand2, cond.operand2):
                 if cond.operand1.is_literal:
                     return cond.operand2, [cond.operand1]
-                elif hasattr(cond.operand1, 'entry') and cond.operand1.entry and cond.operand1.entry.is_const:
+                elif getattr(cond.operand1, 'entry', None) and cond.operand1.entry.is_const:
                     return cond.operand2, [cond.operand1]
         elif (isinstance(cond, ExprNodes.BoolBinopNode) 
                 and cond.operator == 'or'):