From 21aa0ef35123da20d80a96b8d0237187269a77d0 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 2 Apr 1997 05:49:46 +0000 Subject: Changed my mind on replace(). It's now replace(str, old, new, maxsplit=0). Note new ordering of parameters (string first); this is more consistent with translate(). --- Lib/string.py | 14 ++------------ Lib/stringold.py | 14 ++------------ 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/Lib/string.py b/Lib/string.py index 8207a8e..99e7275 100644 --- a/Lib/string.py +++ b/Lib/string.py @@ -321,18 +321,8 @@ def maketrans(fromstr, tostr): return joinfields(L, "") # Substring replacement (global) -def replace(old, new, str): - return joinfields(splitfields(str, old), new) - -# Substring replacement (1st substring only) -def replace1(old, new, str, i=0, last=None): - if last is None: - i = find(str, old, i) - else: - i = find(str, old, i, last) - if i >= 0: - str = str[:i] + new + str[i+len(old):] - return str +def replace(str, old, new, maxsplit=0): + return joinfields(splitfields(str, old, maxsplit), new) # Try importing optional built-in module "strop" -- if it exists, diff --git a/Lib/stringold.py b/Lib/stringold.py index 8207a8e..99e7275 100644 --- a/Lib/stringold.py +++ b/Lib/stringold.py @@ -321,18 +321,8 @@ def maketrans(fromstr, tostr): return joinfields(L, "") # Substring replacement (global) -def replace(old, new, str): - return joinfields(splitfields(str, old), new) - -# Substring replacement (1st substring only) -def replace1(old, new, str, i=0, last=None): - if last is None: - i = find(str, old, i) - else: - i = find(str, old, i, last) - if i >= 0: - str = str[:i] + new + str[i+len(old):] - return str +def replace(str, old, new, maxsplit=0): + return joinfields(splitfields(str, old, maxsplit), new) # Try importing optional built-in module "strop" -- if it exists, -- cgit v0.12