[PATCH 2 of 2 v2] config: use util.compilere to compile regexps
Bryan O'Sullivan
bos at serpentine.com
Fri Jun 1 17:35:17 CDT 2012
# HG changeset patch
# User Bryan O'Sullivan <bryano at fb.com>
# Date 1338589606 25200
# Node ID f6905f027923c06ee84d2ff3c0f818d54827fad8
# Parent 45de1c920fcaea462542a2eaee90c3ac0a83162e
config: use util.compilere to compile regexps
diff --git a/mercurial/config.py b/mercurial/config.py
--- a/mercurial/config.py
+++ b/mercurial/config.py
@@ -7,7 +7,7 @@
from i18n import _
import error, util
-import re, os, errno
+import os, errno
class sortdict(dict):
'a simple sorted dictionary'
@@ -101,13 +101,13 @@ class config(object):
self._source.pop((section, item), None)
def parse(self, src, data, sections=None, remap=None, include=None):
- sectionre = re.compile(r'\[([^\[]+)\]')
- itemre = re.compile(r'([^=\s][^=]*?)\s*=\s*(.*\S|)')
- contre = re.compile(r'\s+(\S|\S.*\S)\s*$')
- emptyre = re.compile(r'(;|#|\s*$)')
- commentre = re.compile(r'(;|#)')
- unsetre = re.compile(r'%unset\s+(\S+)')
- includere = re.compile(r'%include\s+(\S|\S.*\S)\s*$')
+ sectionre = util.compilere(r'\[([^\[]+)\]')
+ itemre = util.compilere(r'([^=\s][^=]*?)\s*=\s*(.*\S|)')
+ contre = util.compilere(r'\s+(\S|\S.*\S)\s*$')
+ emptyre = util.compilere(r'(;|#|\s*$)')
+ commentre = util.compilere(r'(;|#)')
+ unsetre = util.compilere(r'%unset\s+(\S+)')
+ includere = util.compilere(r'%include\s+(\S|\S.*\S)\s*$')
section = ""
item = None
line = 0
More information about the Mercurial-devel
mailing list