summaryrefslogtreecommitdiffstats
path: root/Lib/string.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-05-17 18:20:34 (GMT)
committerGuido van Rossum <guido@python.org>2007-05-17 18:20:34 (GMT)
commitebe3e16600ddbc19aa7444ec773e2e0786b8a3cf (patch)
tree1189de0bc8de926ef5b1baa2f646cbd1674b8bab /Lib/string.py
parente35553e24c6b90db9ab22298cef663192972bbab (diff)
downloadcpython-ebe3e16600ddbc19aa7444ec773e2e0786b8a3cf.zip
cpython-ebe3e16600ddbc19aa7444ec773e2e0786b8a3cf.tar.gz
cpython-ebe3e16600ddbc19aa7444ec773e2e0786b8a3cf.tar.bz2
Merged revisions 55342-55406 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk ........ r55360 | guido.van.rossum | 2007-05-15 14:57:59 -0700 (Tue, 15 May 2007) | 2 lines obcheckin. ........ r55361 | guido.van.rossum | 2007-05-15 14:59:18 -0700 (Tue, 15 May 2007) | 2 lines Get rid of strop module. ........ r55367 | brett.cannon | 2007-05-15 21:06:28 -0700 (Tue, 15 May 2007) | 2 lines Remove the 'pure' module. ........ r55369 | brett.cannon | 2007-05-15 21:07:31 -0700 (Tue, 15 May 2007) | 2 lines Remove the lib-old directory (already empty). ........ r55370 | neal.norwitz | 2007-05-15 21:30:40 -0700 (Tue, 15 May 2007) | 1 line Get rid of a bunch more references to strop ........ r55374 | brett.cannon | 2007-05-15 21:39:00 -0700 (Tue, 15 May 2007) | 2 lines Complete the removal of IRIX-specific modules. ........ r55379 | brett.cannon | 2007-05-15 22:31:54 -0700 (Tue, 15 May 2007) | 2 lines Update removed IRIX modules based on what is gone from removing plat-irix6. ........ r55388 | brett.cannon | 2007-05-16 14:34:52 -0700 (Wed, 16 May 2007) | 2 lines Clean up the docstring for the compiler resource. ........ r55406 | brett.cannon | 2007-05-17 11:05:37 -0700 (Thu, 17 May 2007) | 2 lines Remove BaseException.message (deprecated in Python 2.6). ........
Diffstat (limited to 'Lib/string.py')
-rw-r--r--Lib/string.py11
1 files changed, 0 insertions, 11 deletions
diff --git a/Lib/string.py b/Lib/string.py
index 2bf4995..fd8e91b 100644
--- a/Lib/string.py
+++ b/Lib/string.py
@@ -195,14 +195,3 @@ class Template(metaclass=_TemplateMetaclass):
raise ValueError('Unrecognized named group in pattern',
self.pattern)
return self.pattern.sub(convert, self.template)
-
-
-# Try importing optional built-in module "strop" -- if it exists,
-# it redefines some string operations that are 100-1000 times faster.
-# It also defines values for whitespace, lowercase and uppercase
-# that match <ctype.h>'s definitions.
-
-try:
- from strop import maketrans
-except ImportError:
- pass # Use the original versions