summaryrefslogtreecommitdiffstats
path: root/Objects/unicodeobject.c
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-06-08 13:41:29 (GMT)
committerGeorg Brandl <georg@python.org>2009-06-08 13:41:29 (GMT)
commitc6c31789426faa6ad47f210f6fce6d7c2e92ac56 (patch)
tree3f7c3a006df0e9c819c91e246c241d480ed0e7bc /Objects/unicodeobject.c
parent8d8f197c9ccec9320d9daa9b9c2ce54159e689f9 (diff)
downloadcpython-c6c31789426faa6ad47f210f6fce6d7c2e92ac56.zip
cpython-c6c31789426faa6ad47f210f6fce6d7c2e92ac56.tar.gz
cpython-c6c31789426faa6ad47f210f6fce6d7c2e92ac56.tar.bz2
Merged revisions 73190,73213,73257-73258,73260,73275,73294 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r73190 | georg.brandl | 2009-06-04 01:23:45 +0200 (Do, 04 Jun 2009) | 2 lines Avoid PendingDeprecationWarnings emitted by deprecated unittest methods. ........ r73213 | georg.brandl | 2009-06-04 12:15:57 +0200 (Do, 04 Jun 2009) | 1 line #5967: note that the C slicing APIs do not support negative indices. ........ r73257 | georg.brandl | 2009-06-06 19:50:05 +0200 (Sa, 06 Jun 2009) | 1 line #6211: elaborate a bit on ways to call the function. ........ r73258 | georg.brandl | 2009-06-06 19:51:31 +0200 (Sa, 06 Jun 2009) | 1 line #6204: use a real reference instead of "see later". ........ r73260 | georg.brandl | 2009-06-06 20:21:58 +0200 (Sa, 06 Jun 2009) | 1 line #6224: s/JPython/Jython/, and remove one link to a module nine years old. ........ r73275 | georg.brandl | 2009-06-07 22:37:52 +0200 (So, 07 Jun 2009) | 1 line Add Ezio. ........ r73294 | georg.brandl | 2009-06-08 15:34:52 +0200 (Mo, 08 Jun 2009) | 1 line #6194: O_SHLOCK/O_EXLOCK are not really more platform independent than lockf(). ........
Diffstat (limited to 'Objects/unicodeobject.c')
-rw-r--r--Objects/unicodeobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 7cc7037..0d4a3dd 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -6830,7 +6830,7 @@ unicode_center(PyUnicodeObject *self, PyObject *args)
/* This code should go into some future Unicode collation support
module. The basic comparison should compare ordinals on a naive
- basis (this is what Java does and thus JPython too). */
+ basis (this is what Java does and thus Jython too). */
/* speedy UTF-16 code point order comparison */
/* gleaned from: */