From a937b50d1bc704862f57a3ef9123fe5894417491 Mon Sep 17 00:00:00 2001 From: moculus Date: Tue, 5 May 2009 00:33:49 +0000 Subject: [PATCH] python bugfix and svn cleanup --HG-- branch : pmacs2 --- method/svn.py | 2 +- mode/python.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/method/svn.py b/method/svn.py index 63b622e..3bdc0d6 100644 --- a/method/svn.py +++ b/method/svn.py @@ -137,7 +137,7 @@ class SvnStatus(Method): class SvnLog(Method): '''display the SVN log for the current file''' sep_re = re.compile('^-+$') - log_re = re.compile('^(.+?) \| (.+?) \| (.{25}) .+? \| (.+)$') + log_re = re.compile(r'^(.+?) \| (.+?) \| (.{25}) .+? \| (.+)$') def _build_entry(self, log_line, mesg_lines): log_data = '[c:d:*]%s [g:d:*]%s [b:d:*]%s [c:d:*]%s' % log_line mesg_data = '\n'.join(mesg_lines).strip() diff --git a/mode/python.py b/mode/python.py index 68b9526..3f5ba6a 100644 --- a/mode/python.py +++ b/mode/python.py @@ -50,7 +50,7 @@ class PythonGrammar(Grammar): PatternRule('python.system_identifier', '__[a-zA-Z0-9_]+__'), PatternRule('python.private_identifier', '__[a-zA-Z0-9_]*'), PatternRule('python.hidden_identifier', '_[a-zA-Z0-9_]*'), - PatternRule('python.identifier', '[a-zA-Z_][a-zA-Z0-9_]*'), + PatternRule('python.identifier', '[a-zA-Z_][a-zA-Z0-9_]*(?![a-zA-Z0-9_\'"])'), RegionRule('rawstring', 'r"""', StringGrammar4, '"""'), RegionRule('rawstring', "r'''", StringGrammar3, "'''"),