From c034605a698f16bf910286444297861b9371d609 Mon Sep 17 00:00:00 2001
From: Erik Osheim <erik@osheim.org>
Date: Sun, 12 Jul 2009 18:30:31 -0400
Subject: [PATCH] bug parsing python decorators

--HG--
branch : pmacs2
---
 mode/python.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/python.py b/mode/python.py
index 6d2f932..b11a4f6 100644
--- a/mode/python.py
+++ b/mode/python.py
@@ -61,7 +61,7 @@ class PythonGrammar(Grammar):
         RegionRule('string', 'u?"', StringGrammar2, '"'),
         RegionRule('string', "u?'", StringGrammar1, "'"),
 
-        PatternRule('delimiter', r'\(|\)|\[|\]|{|}|@|,|:|\.|`|=|;|\+=|-=|\*=|/=|//=|%=|&=|\|=|\^=|>>=|<<=|\*\*='),
+        PatternRule('delimiter', r'\(|\)|\[|\]|{|}|,|:|\.|`|=|;|\+=|-=|\*=|/=|//=|%=|&=|\|=|\^=|>>=|<<=|\*\*='),
         PatternRule(r"python.integer", r"(?<![\.0-9a-zA-Z_])(?:0|-?[1-9][0-9]*|0[0-7]+|0[xX][0-9a-fA-F]+)[lL]?(?![\.0-9a-zA-Z_])"),
         PatternRule(r"python.float", r"(?<![\.0-9a-zA-Z_])(?:-?[0-9]+\.[0-9]*|-?\.[0-9]+|(?:[0-9]|[0-9]+\.[0-9]*|-?\.[0-9]+)[eE][\+-]?[0-9]+)(?![\.0-9a-zA-Z_])"),
         PatternRule(r"python.imaginary", r"(?<![\.0-9a-zA-Z_])(?:[0-9]+|(?:[0-9]+\.[0-9]*|\.[0-9]+|(?:[0-9]|[0-9]+\.[0-9]*|\.[0-9]+)[eE][\+-]?[0-9]+)[jJ])(?![\.0-9a-zA-Z_])"),
@@ -71,7 +71,7 @@ class PythonGrammar(Grammar):
         OverridePatternRule('comment', '#@@:(?P<token>[.a-zA-Z0-9_]+):(?P<mode>[.a-zA-Z0-9_]+) *$'),
         PatternRule('comment', '#.*$'),
         PatternRule('continuation', r'\\\n$'),
-        PatternRule('decorator', '@[a-zA-Z_][a-zA-Z0-9_]*'),
+        PatternRule('python.decorator', '@[a-zA-Z_][a-zA-Z0-9_]*'),
         PatternRule('spaces', ' +'),
         PatternRule('eol', r'\n$'),
     ]