[PATCH 2 of 2] config: use util.recompile to compile regexps

Bryan O'Sullivan bos at serpentine.com
Mon May 21 22:54:45 CDT 2012


# HG changeset patch
# User Bryan O'Sullivan <bryano at fb.com>
# Date 1337658867 25200
# Node ID c64683fa6e52debe940742216b865855d5f4f600
# Parent  a21cfc39cd5f2d1745f26565cf4999a21c10d8ff
config: use util.recompile 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.recompile(r'\[([^\[]+)\]')
+        itemre = util.recompile(r'([^=\s][^=]*?)\s*=\s*(.*\S|)')
+        contre = util.recompile(r'\s+(\S|\S.*\S)\s*$')
+        emptyre = util.recompile(r'(;|#|\s*$)')
+        commentre = util.recompile(r'(;|#)')
+        unsetre = util.recompile(r'%unset\s+(\S+)')
+        includere = util.recompile(r'%include\s+(\S|\S.*\S)\s*$')
         section = ""
         item = None
         line = 0


More information about the Mercurial-devel mailing list