Minor fixes

Yelp · Jun 2, 2016 · bf00535 · bf00535
1 parent f9a8d18
commit bf00535
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/Cheetah/legacy_parser.py b/Cheetah/legacy_parser.py
@@ -222,7 +222,6 @@ def matchTopLevelToken(self):
 
         Returns None if no match.
         """
-        match = None
         if self.peek() in '#$':
             for matcher in (
                     self.matchCommentStartToken,
@@ -232,8 +231,8 @@ def matchTopLevelToken(self):
             ):
                 match = matcher()
                 if match:
-                    break
-        return match
+                    return match
+        return None
 
     def getPyToken(self):
         match = python_token_re.match(self.src(), self.pos())
@@ -847,7 +846,7 @@ def eatSimpleIndentingDirective(self, directiveName, callback):
         expr = self.getExpression(pyTokensToBreakAt=[':'])
         if self.matchColonForSingleLineShortFormDirective():
             self.advance()  # skip over :
-            if directiveName in 'else elif except finally'.split():
+            if directiveName in {'else', 'elif', 'except', 'finally'}:
                 callback(expr, lineCol, dedent=False)
             else:
                 callback(expr, lineCol)