From d9c9241ecd71754b15d82fa61405413ec2699ff2 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 26 Oct 2010 00:03:23 -0400 Subject: simplify BFG_IN_ATTR --- pyramid/fixers/fix_bfg_imports.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyramid/fixers/fix_bfg_imports.py b/pyramid/fixers/fix_bfg_imports.py index c4a0605fe..c29898a65 100644 --- a/pyramid/fixers/fix_bfg_imports.py +++ b/pyramid/fixers/fix_bfg_imports.py @@ -176,12 +176,12 @@ for name in MODULE_NAMES: MODULE_ALTERNATIVES = '|'.join(MODULE_ALTERNATIVES) BFG_NS_RE = r'xmlns\s*?=\s*?[\'\"]http://namespaces\.repoze\.org/bfg[\'\"]' -BFG_IN_ATTR = r'[\'\"]\s*?(repoze\.bfg)(%s)\s*?[\'\"]' % MODULE_ALTERNATIVES +BFG_IN_ATTR = r'(repoze\.bfg)(%s)' % MODULE_ALTERNATIVES ATTR = re.compile(BFG_IN_ATTR, re.MULTILINE) NS = re.compile(BFG_NS_RE, re.MULTILINE) def replace(match): - return '"pyramid%s"' % match.group(2) + return 'pyramid%s' % match.group(2) def fix_zcml(path): for root, dirs, files in os.walk(path): -- cgit v1.2.3