From c9423109f5d1e9f4fd034f036687468de6eeb638 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Tue, 22 Feb 2011 01:55:36 +0000 Subject: [PATCH] Factor-out common code for helper classes. --- Lib/collections/__init__.py | 2 +- Lib/string.py | 22 +++------------------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py index 6c41db3728..89cf2edd3c 100644 --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -633,7 +633,7 @@ class Counter(dict): ######################################################################## -### ChainMap (helper for configparser) +### ChainMap (helper for configparser and string.Template) ######################################################################## class _ChainMap(MutableMapping): diff --git a/Lib/string.py b/Lib/string.py index ef0334c472..2bc5d00803 100644 --- a/Lib/string.py +++ b/Lib/string.py @@ -46,23 +46,7 @@ def capwords(s, sep=None): #################################################################### import re as _re - -class _multimap: - """Helper class for combining multiple mappings. - - Used by .{safe_,}substitute() to combine the mapping and keyword - arguments. - """ - def __init__(self, primary, secondary): - self._primary = primary - self._secondary = secondary - - def __getitem__(self, key): - try: - return self._primary[key] - except KeyError: - return self._secondary[key] - +from collections import _ChainMap class _TemplateMetaclass(type): pattern = r""" @@ -116,7 +100,7 @@ class Template(metaclass=_TemplateMetaclass): if not args: mapping = kws elif kws: - mapping = _multimap(kws, args[0]) + mapping = _ChainMap(kws, args[0]) else: mapping = args[0] # Helper function for .sub() @@ -142,7 +126,7 @@ class Template(metaclass=_TemplateMetaclass): if not args: mapping = kws elif kws: - mapping = _multimap(kws, args[0]) + mapping = _ChainMap(kws, args[0]) else: mapping = args[0] # Helper function for .sub() -- 2.50.1