summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2000-03-20 16:36:48 (GMT)
committerBarry Warsaw <barry@python.org>2000-03-20 16:36:48 (GMT)
commit51ac58039f62ef9d605974dae32a6ada9c26039b (patch)
treec8aee44da7330978efe15671b2c9e98bc898eea3 /Lib
parentabc411bac883c1706a9dcc8b1bea85a0b940cbfb (diff)
downloadcpython-51ac58039f62ef9d605974dae32a6ada9c26039b.zip
cpython-51ac58039f62ef9d605974dae32a6ada9c26039b.tar.gz
cpython-51ac58039f62ef9d605974dae32a6ada9c26039b.tar.bz2
On 17-Mar-2000, Marc-Andre Lemburg said:
Attached you find an update of the Unicode implementation. The patch is against the current CVS version. I would appreciate if someone with CVS checkin permissions could check the changes in. The patch contains all bugs and patches sent this week and also fixes a leak in the codecs code and a bug in the free list code for Unicode objects (which only shows up when compiling Python with Py_DEBUG; thanks to MarkH for spotting this one).
Diffstat (limited to 'Lib')
-rw-r--r--Lib/encodings/__init__.py6
-rw-r--r--Lib/test/test_string.py1
-rw-r--r--Lib/test/test_unicode.py1
3 files changed, 5 insertions, 3 deletions
diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py
index c33b822..cd5876e 100644
--- a/Lib/encodings/__init__.py
+++ b/Lib/encodings/__init__.py
@@ -30,13 +30,13 @@ Written by Marc-Andre Lemburg (mal@lemburg.com).
import string,codecs,aliases
_cache = {}
-_unkown = '--unkown--'
+_unknown = '--unknown--'
def search_function(encoding):
# Cache lookup
- entry = _cache.get(encoding,_unkown)
- if entry is not _unkown:
+ entry = _cache.get(encoding,_unknown)
+ if entry is not _unknown:
return entry
# Import the module
diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py
index bb6d035..4a3e474 100644
--- a/Lib/test/test_string.py
+++ b/Lib/test/test_string.py
@@ -143,6 +143,7 @@ test('translate', 'abc', 'Abc', table)
test('translate', 'xyz', 'xyz', table)
test('replace', 'one!two!three!', 'one@two!three!', '!', '@', 1)
+test('replace', 'one!two!three!', 'onetwothree', '!', '')
test('replace', 'one!two!three!', 'one@two@three!', '!', '@', 2)
test('replace', 'one!two!three!', 'one@two@three@', '!', '@', 3)
test('replace', 'one!two!three!', 'one@two@three@', '!', '@', 4)
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 64b8ff8..69d4273 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -108,6 +108,7 @@ if 0:
test('translate', u'xyz', u'xyz', table)
test('replace', u'one!two!three!', u'one@two!three!', u'!', u'@', 1)
+test('replace', u'one!two!three!', u'onetwothree', '!', '')
test('replace', u'one!two!three!', u'one@two@three!', u'!', u'@', 2)
test('replace', u'one!two!three!', u'one@two@three@', u'!', u'@', 3)
test('replace', u'one!two!three!', u'one@two@three@', u'!', u'@', 4)