summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-09-18 21:49:06 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-09-18 21:49:06 (GMT)
commitf38a69f97954aae455b87391723a9936dcd313a1 (patch)
tree47fcdf0f66910beb959841d1aba019d9cdad5d9b /Objects
parent308d637c94b9ed88c386b83891ad38b2131ebd12 (diff)
downloadcpython-f38a69f97954aae455b87391723a9936dcd313a1.zip
cpython-f38a69f97954aae455b87391723a9936dcd313a1.tar.gz
cpython-f38a69f97954aae455b87391723a9936dcd313a1.tar.bz2
kill merged line
Diffstat (limited to 'Objects')
-rw-r--r--Objects/unicodeobject.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 78ef7e1..767bed0 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8822,7 +8822,6 @@ static PyMethodDef unicode_methods[] = {
{"ljust", (PyCFunction) unicode_ljust, METH_VARARGS, ljust__doc__},
{"lower", (PyCFunction) unicode_lower, METH_NOARGS, lower__doc__},
{"lstrip", (PyCFunction) unicode_lstrip, METH_VARARGS, lstrip__doc__},
-/* {"maketrans", (PyCFunction) unicode_maketrans, METH_VARARGS, maketrans__doc__}, */
{"rfind", (PyCFunction) unicode_rfind, METH_VARARGS, rfind__doc__},
{"rindex", (PyCFunction) unicode_rindex, METH_VARARGS, rindex__doc__},
{"rjust", (PyCFunction) unicode_rjust, METH_VARARGS, rjust__doc__},