]> git.ipfire.org Git - thirdparty/Python/cpython.git/log
thirdparty/Python/cpython.git
19 years agoBug #1323369: document possible values of sys.getwindowsversion()
Georg Brandl [Mon, 20 Feb 2006 12:15:26 +0000 (12:15 +0000)] 
Bug #1323369: document possible values of sys.getwindowsversion()
platform field

19 years agoBug #1101233: fix test_fcntl on netbsd2 platform.
Georg Brandl [Mon, 20 Feb 2006 10:32:05 +0000 (10:32 +0000)] 
Bug #1101233: fix test_fcntl on netbsd2 platform.

19 years agoBackported from r41842.
Armin Rigo [Mon, 20 Feb 2006 10:21:14 +0000 (10:21 +0000)] 
Backported from r41842.

19 years agoBug #854823: socketmodule now builds on Sun platforms even when
Georg Brandl [Mon, 20 Feb 2006 09:42:37 +0000 (09:42 +0000)] 
Bug #854823: socketmodule now builds on Sun platforms even when
INET_ADDRSTRLEN is not defined.

19 years agoMake clear that patch #1336582 wasn't a new feature.
Georg Brandl [Sun, 19 Feb 2006 13:22:58 +0000 (13:22 +0000)] 
Make clear that patch #1336582 wasn't a new feature.

19 years agoPatch #1337756: fileinput now accepts Unicode filenames.
Georg Brandl [Sun, 19 Feb 2006 09:51:33 +0000 (09:51 +0000)] 
Patch #1337756: fileinput now accepts Unicode filenames.

19 years agoPatch #1352711: make zipimport raise a complete IOError
Georg Brandl [Sun, 19 Feb 2006 09:39:02 +0000 (09:39 +0000)] 
Patch #1352711: make zipimport raise a complete IOError

19 years agoBug #801349: document that start/stop/step slice arguments can be None
Georg Brandl [Sun, 19 Feb 2006 00:12:46 +0000 (00:12 +0000)] 
Bug #801349: document that start/stop/step slice arguments can be None

19 years agoPatch #1415507: clarify docs on reference stealing
Georg Brandl [Sat, 18 Feb 2006 22:56:02 +0000 (22:56 +0000)] 
Patch #1415507: clarify docs on reference stealing

19 years agoBug #1366000: cleanup BZ2File.seek() logic. Fixes the case of whence=2, offset>=0.
Georg Brandl [Sat, 18 Feb 2006 21:57:28 +0000 (21:57 +0000)] 
Bug #1366000: cleanup BZ2File.seek() logic. Fixes the case of whence=2, offset>=0.

19 years agoBackport: This should get test_timeout to pass when running on any python.org host.
Neal Norwitz [Sat, 18 Feb 2006 21:25:56 +0000 (21:25 +0000)] 
Backport: This should get test_timeout to pass when running on any python.org host.

19 years agoPatch #1373643: The chunk module can now read chunks larger than
Georg Brandl [Sat, 18 Feb 2006 21:10:59 +0000 (21:10 +0000)] 
Patch #1373643: The chunk module can now read chunks larger than
two gigabytes.

19 years agoRemove soundex from "undocumented modules".
Georg Brandl [Fri, 17 Feb 2006 11:51:20 +0000 (11:51 +0000)] 
Remove soundex from "undocumented modules".

19 years agoBug #1430298: It is now possible to send a mail with an empty
Georg Brandl [Fri, 17 Feb 2006 09:53:00 +0000 (09:53 +0000)] 
Bug #1430298: It is now possible to send a mail with an empty
return address using smtplib.

19 years agoBug #1432260: better handle lambda functions' names in pydoc
Georg Brandl [Fri, 17 Feb 2006 09:47:47 +0000 (09:47 +0000)] 
Bug #1432260: better handle lambda functions' names in pydoc

19 years agoPatch #1432345: Make python compile on DragonFly.
Martin v. Löwis [Fri, 17 Feb 2006 08:39:55 +0000 (08:39 +0000)] 
Patch #1432345: Make python compile on DragonFly.

19 years agoCast assignments to ``unsigned char *`` from PyString_AS_STRING() calls to
Brett Cannon [Thu, 16 Feb 2006 07:01:45 +0000 (07:01 +0000)] 
Cast assignments to ``unsigned char *`` from PyString_AS_STRING() calls to
silence compiler warnings on gcc 4.0.1 .

19 years agouse correct function in example (backport of trunk revision 42377)
Fred Drake [Wed, 15 Feb 2006 06:56:35 +0000 (06:56 +0000)] 
use correct function in example (backport of trunk revision 42377)

19 years agoSend failures to python-checkins, cc/me.
Neal Norwitz [Wed, 15 Feb 2006 05:02:00 +0000 (05:02 +0000)] 
Send failures to python-checkins, cc/me.

19 years agoAdd build.sh to 2.4 so we can build the docs (and only the docs).
Neal Norwitz [Tue, 14 Feb 2006 08:16:01 +0000 (08:16 +0000)] 
Add build.sh to 2.4 so we can build the docs (and only the docs).

19 years agoTry to improve name based on discussion on python-checkins with Jim Jewett
Neal Norwitz [Mon, 13 Feb 2006 00:37:09 +0000 (00:37 +0000)] 
Try to improve name based on discussion on python-checkins with Jim Jewett

19 years agoBackport r42314 which fixed Windows breakage when checking that socket
Neal Norwitz [Sun, 12 Feb 2006 21:07:17 +0000 (21:07 +0000)] 
Backport r42314 which fixed Windows breakage when checking that socket
descriptors fit in fd_set.

Introduce Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE.
Proposed by Tim Peters implemented by Martin von Loewis.

19 years agoEven more copyright locations!
Georg Brandl [Sat, 11 Feb 2006 18:21:44 +0000 (18:21 +0000)] 
Even more copyright locations!

19 years agoPatch #428494: Prefer linking against ncursesw over ncurses library
Martin v. Löwis [Sat, 11 Feb 2006 15:55:22 +0000 (15:55 +0000)] 
Patch #428494: Prefer linking against ncursesw over ncurses library

19 years agoUpdate general copyright year to 2006.
Georg Brandl [Sat, 11 Feb 2006 15:30:59 +0000 (15:30 +0000)] 
Update general copyright year to 2006.

19 years agoPort of r42279 to email 3.0, but without the Python 2.1 backward compatible
Barry Warsaw [Thu, 9 Feb 2006 04:10:03 +0000 (04:10 +0000)] 
Port of r42279 to email 3.0, but without the Python 2.1 backward compatible
nonsense.

Resolve SF bug 1409403: email.Message should supress warning from uu.decode.

19 years agoPort of r42271 from the trunk -- relevant patches for SF 1409455 for email
Barry Warsaw [Wed, 8 Feb 2006 14:58:55 +0000 (14:58 +0000)] 
Port of r42271 from the trunk -- relevant patches for SF 1409455 for email
3.0/Python 2.4.

19 years agoBackport:
Neal Norwitz [Tue, 7 Feb 2006 07:17:37 +0000 (07:17 +0000)] 
Backport:
Bug #876637, prevent stack corruption when socket descriptor
is larger than FD_SETSIZE.

This can only be acheived with ulimit -n SOME_NUMBER_BIGGER_THAN_FD_SETSIZE
which is typically only available to root.  Since this wouldn't normally
be run in a test (ie, run as root), it doesn't seem too worthwhile to
add a normal test.  The bug report has one version of a test.  I've
written another.  Not sure what the best thing to do is.

Do the check before calling internal_select() because we can't set
an error in between Py_BEGIN_ALLOW_THREADS and Py_END_ALLOW_THREADS.
This seemed the clearest solution.

19 years agoBackport:
Neal Norwitz [Sun, 5 Feb 2006 06:00:54 +0000 (06:00 +0000)] 
Backport:
  Patch #1407135, bug #1424041: mmap.mmap(-1, size, ...) can return
  anonymous memory again on Unix.

19 years agoResolves SF bug #1423972.
Barry Warsaw [Sat, 4 Feb 2006 23:45:12 +0000 (23:45 +0000)] 
Resolves SF bug #1423972.

19 years agoSF bug 1415455, fix typo in module name
Neal Norwitz [Sat, 4 Feb 2006 22:59:56 +0000 (22:59 +0000)] 
SF bug 1415455, fix typo in module name

19 years agoFix typo
Neal Norwitz [Sat, 4 Feb 2006 03:29:52 +0000 (03:29 +0000)] 
Fix typo

19 years agoPort r42228 from the trunk.
Barry Warsaw [Fri, 3 Feb 2006 05:41:33 +0000 (05:41 +0000)] 
Port r42228 from the trunk.

19 years agoWork around a Solaris peculiarity that caused test_pty to sometimes fail: a
Thomas Wouters [Sat, 28 Jan 2006 12:08:39 +0000 (12:08 +0000)] 
Work around a Solaris peculiarity that caused test_pty to sometimes fail: a
tty opened by os.openpty() isn't always a tty according to os.isatty(), when
it's tested inside the process that opened it. Doesn't affect actual
functionality, as using a tty this way is rarely, if ever, useful. Ignoring
the failure allows the test for actual functionality to continue.

19 years agoFix PyGC_Collect() to be exported from the built DLL on Windows. (Fix given
Barry Warsaw [Thu, 26 Jan 2006 18:49:57 +0000 (18:49 +0000)] 
Fix PyGC_Collect() to be exported from the built DLL on Windows.  (Fix given
by Matt Messier).

19 years agoBackport 42173: get bsddb test_associate to pass with BSDDB 4.1
Neal Norwitz [Thu, 26 Jan 2006 05:19:56 +0000 (05:19 +0000)] 
Backport 42173: get bsddb test_associate to pass with BSDDB 4.1

19 years agoFind bdb4 correctly on gentoo systems (this matches head)
Neal Norwitz [Wed, 25 Jan 2006 08:18:43 +0000 (08:18 +0000)] 
Find bdb4 correctly on gentoo systems (this matches head)

19 years agoRemove file even if non-existant
Neal Norwitz [Wed, 25 Jan 2006 07:58:22 +0000 (07:58 +0000)] 
Remove file even if non-existant

19 years agoRemove generated test db files
Neal Norwitz [Wed, 25 Jan 2006 07:22:01 +0000 (07:22 +0000)] 
Remove generated test db files

19 years agoBackport:
Neal Norwitz [Wed, 25 Jan 2006 05:43:53 +0000 (05:43 +0000)] 
Backport:
mwh pointed out _Filemodule.c is generated. So to fix the memory leak
this file (the source) must be fixed.

19 years agoBackport:
Neal Norwitz [Wed, 25 Jan 2006 05:29:17 +0000 (05:29 +0000)] 
Backport:
Fix bug #1413192, fix seg fault in bsddb if a txn was deleted before the env.

19 years agobackport of commit 42169
Gregory P. Smith [Tue, 24 Jan 2006 10:02:02 +0000 (10:02 +0000)] 
backport of commit 42169

adds support for compiling against BerkeleyDB 4.4.x

19 years agoFix SF #1412837, compile failed with Watcom compiler
Neal Norwitz [Tue, 24 Jan 2006 06:08:23 +0000 (06:08 +0000)] 
Fix SF #1412837, compile failed with Watcom compiler

19 years agoCorrect misspellings.
Georg Brandl [Mon, 23 Jan 2006 22:00:32 +0000 (22:00 +0000)] 
Correct misspellings.

19 years agoBackport typo fixes.
Georg Brandl [Mon, 23 Jan 2006 21:34:21 +0000 (21:34 +0000)] 
Backport typo fixes.

19 years agoBackport: This should fix a mem leak on the Mac. Brett tested it.
Neal Norwitz [Mon, 23 Jan 2006 07:37:28 +0000 (07:37 +0000)] 
Backport: This should fix a mem leak on the Mac.  Brett tested it.

19 years agoAnother typo.
Georg Brandl [Sun, 22 Jan 2006 20:47:30 +0000 (20:47 +0000)] 
Another typo.

19 years agotypo
Georg Brandl [Sun, 22 Jan 2006 19:38:07 +0000 (19:38 +0000)] 
typo

19 years agoCorrect several typos in libos.tex. Bug #1412227.
Georg Brandl [Sun, 22 Jan 2006 19:35:04 +0000 (19:35 +0000)] 
Correct several typos in libos.tex. Bug #1412227.

19 years agoTypo
Georg Brandl [Sun, 22 Jan 2006 16:11:04 +0000 (16:11 +0000)] 
Typo

19 years agoBackport winreg documentation quirk fix.
Georg Brandl [Sun, 22 Jan 2006 13:52:08 +0000 (13:52 +0000)] 
Backport winreg documentation quirk fix.

19 years agoRemove reference to Grail and Netscape 2.0 from cgi docs.
Georg Brandl [Sun, 22 Jan 2006 13:49:24 +0000 (13:49 +0000)] 
Remove reference to Grail and Netscape 2.0 from cgi docs.

19 years agoBug #1378679: backport bugfix of #974757.
Georg Brandl [Fri, 20 Jan 2006 22:00:43 +0000 (22:00 +0000)] 
Bug #1378679: backport bugfix of #974757.

19 years agoPatch #1410783: add documentation links for static/classmethod
Georg Brandl [Fri, 20 Jan 2006 21:34:01 +0000 (21:34 +0000)] 
Patch #1410783: add documentation links for static/classmethod

19 years agoRemove NEWS entry of reverted checkin.
Georg Brandl [Fri, 20 Jan 2006 21:19:52 +0000 (21:19 +0000)] 
Remove NEWS entry of reverted checkin.

19 years agoDocument supported schemes.
Georg Brandl [Fri, 20 Jan 2006 21:16:54 +0000 (21:16 +0000)] 
Document supported schemes.

19 years agoRevert feature checkin.
Georg Brandl [Fri, 20 Jan 2006 21:09:55 +0000 (21:09 +0000)] 
Revert feature checkin.

19 years agoReverse checkin. This is definitely a new feature.
Georg Brandl [Fri, 20 Jan 2006 21:08:54 +0000 (21:08 +0000)] 
Reverse checkin. This is definitely a new feature.

19 years agoPatch #1388073: Make unittest.TestCase easier to subclass
Georg Brandl [Fri, 20 Jan 2006 17:55:02 +0000 (17:55 +0000)] 
Patch #1388073: Make unittest.TestCase easier to subclass

19 years agoAdd markup to a "Python Standard Library" doc reference I added for bug 839585.
Georg Brandl [Fri, 20 Jan 2006 17:51:40 +0000 (17:51 +0000)] 
Add markup to a "Python Standard Library" doc reference I added for bug 839585.

19 years agoCheckin the test of patch #1400181.
Georg Brandl [Fri, 20 Jan 2006 17:48:57 +0000 (17:48 +0000)] 
Checkin the test of patch #1400181.

19 years agoBug #1407902: Added support for sftp:// URIs to urlparse.
Georg Brandl [Fri, 20 Jan 2006 17:24:34 +0000 (17:24 +0000)] 
Bug #1407902: Added support for sftp:// URIs to urlparse.

19 years agoReadd bug report note.
Georg Brandl [Fri, 20 Jan 2006 13:38:41 +0000 (13:38 +0000)] 
Readd bug report note.

19 years agoBug #1402224: Add warning to dl docs about crashes.
Georg Brandl [Fri, 20 Jan 2006 09:35:04 +0000 (09:35 +0000)] 
Bug #1402224: Add warning to dl docs about crashes.

19 years agoBug #1396471: Document that Windows' ftell() can return invalid
Georg Brandl [Fri, 20 Jan 2006 09:14:41 +0000 (09:14 +0000)] 
Bug #1396471: Document that Windows' ftell() can return invalid
values for text files with UNIX-style line endings.

19 years agoBug #1371247: Update Windows LCIDs in locale.py.
Georg Brandl [Fri, 20 Jan 2006 09:07:55 +0000 (09:07 +0000)] 
Bug #1371247: Update Windows LCIDs in  locale.py.

19 years agoadd missing version identification
Fred Drake [Fri, 20 Jan 2006 03:31:17 +0000 (03:31 +0000)] 
add missing version identification

19 years agoSF bug #1347874; FeedParser does not comply with RFC2822.
Barry Warsaw [Tue, 17 Jan 2006 05:59:18 +0000 (05:59 +0000)] 
SF bug #1347874; FeedParser does not comply with RFC2822.

Change headerRE as suggested in the bug report, so that single character
headers are accepted.  Test case added too.  Backported from the trunk.

19 years agoUpdate documentation for email.Message.get_filename().
Barry Warsaw [Tue, 17 Jan 2006 05:29:56 +0000 (05:29 +0000)] 
Update documentation for email.Message.get_filename().

19 years agoSF Bug #1407069, Remove extra semi-colon if there is no long long
Neal Norwitz [Tue, 17 Jan 2006 05:28:07 +0000 (05:28 +0000)] 
SF Bug #1407069, Remove extra semi-colon if there is no long long

19 years agoPorted 42076 from the trunk.
Barry Warsaw [Tue, 17 Jan 2006 05:09:19 +0000 (05:09 +0000)] 
Ported 42076 from the trunk.

SF bug #1403349 solution for email 3.0; some MUAs use the 'file' parameter
name in the Content-Distribution header, so Message.get_filename() should fall
back to using that.

Also, bump the email package version to 3.0.1 for eventual release.  Of
course, add a test case too.

XXX Need to update the documentation.

19 years agoExceptions raised during renaming in rotating file handlers are now passed to handleE...
Vinay Sajip [Mon, 16 Jan 2006 09:28:59 +0000 (09:28 +0000)] 
Exceptions raised during renaming in rotating file handlers are now passed to handleError (except for SystemExit and KeyboardInterrupt, which are re-raised).

19 years agoTimedRotatingFileHandler now calculates next rollover from previous rollover rather...
Vinay Sajip [Mon, 16 Jan 2006 09:14:47 +0000 (09:14 +0000)] 
TimedRotatingFileHandler now calculates next rollover from previous rollover rather than current time.

19 years agoFixed bug in time-to-midnight calculation.
Vinay Sajip [Mon, 16 Jan 2006 09:10:05 +0000 (09:10 +0000)] 
Fixed bug in time-to-midnight calculation.

19 years agoRemove dots in \version{added,changed} arguments.
Georg Brandl [Sun, 15 Jan 2006 07:55:42 +0000 (07:55 +0000)] 
Remove dots in \version{added,changed} arguments.

19 years agoFix typo
Neal Norwitz [Sat, 14 Jan 2006 07:03:44 +0000 (07:03 +0000)] 
Fix typo

19 years agoBackport:
Neal Norwitz [Sat, 14 Jan 2006 07:02:53 +0000 (07:02 +0000)] 
Backport:
Fix SF bug #1402308, segfault when using mmap(-1, ...)

This didn't crash on Linux, but valgrind complained.
I'm not sure if this test is valid on Windows.

19 years agoBug #1394565: SimpleHTTPServer now doesn't choke on query paramters
Georg Brandl [Fri, 13 Jan 2006 17:06:02 +0000 (17:06 +0000)] 
Bug #1394565: SimpleHTTPServer now doesn't choke on query paramters
any more.

19 years agoBug #1403410: The warnings module now doesn't get confused
Georg Brandl [Fri, 13 Jan 2006 16:59:54 +0000 (16:59 +0000)] 
Bug #1403410: The warnings module now doesn't get confused
when it can't find out the module name it generates a warning for.

19 years agoTest curses.setupterm() before initscr().
Georg Brandl [Thu, 12 Jan 2006 15:41:15 +0000 (15:41 +0000)] 
Test curses.setupterm() before initscr().

19 years agoBug #1397205: doc typo
Georg Brandl [Tue, 10 Jan 2006 21:37:44 +0000 (21:37 +0000)] 
Bug #1397205: doc typo

19 years agoBackport:
Neal Norwitz [Tue, 10 Jan 2006 07:08:06 +0000 (07:08 +0000)] 
Backport:
SF bug #1400822, Extended version of _curses over{lay,write} does not work

Fix signatures to conform to doc (also fixed ungetmouse()).

19 years agoBackport:
Neal Norwitz [Tue, 10 Jan 2006 06:05:57 +0000 (06:05 +0000)] 
Backport:
- Patch #1400181, fix unicode string formatting to not use the locale.
  This is how string objects work.  u'%f' could use , instead of .
  for the decimal point.  Now both strings and unicode always use periods.

This is the code that would break:

    import locale
    locale.setlocale(locale.LC_NUMERIC, 'de_DE')
    u'%.1f' % 1.0
    assert '1.0' == u'%.1f' % 1.0

I couldn't create a test case which fails, but this fixes the problem.
(tested in interpreter and reported fixed by others)

19 years agoBackport:
Neal Norwitz [Mon, 9 Jan 2006 07:10:56 +0000 (07:10 +0000)] 
Backport:
Fix bugs #1244610, #1392915, fix build problem on OpenBSD 3.7 and 3.8.
configure would break checking curses.h.

Also fix whitespace consistency which I forgot to mention in the head checkin.

19 years agoBackport:
Neal Norwitz [Mon, 9 Jan 2006 06:29:16 +0000 (06:29 +0000)] 
Backport:
Bug #1400115, Fix segfault when calling curses.panel.userptr()
without prior setting of the userptr.

19 years agoPatch #881820: look for openpty and forkpty also in libbsd.
Martin v. Löwis [Sun, 8 Jan 2006 10:07:57 +0000 (10:07 +0000)] 
Patch #881820: look for openpty and forkpty also in libbsd.

19 years agoSkip this test on Darwin. It's skipped on the trunk and is listed as
Skip Montanaro [Sat, 7 Jan 2006 19:08:55 +0000 (19:08 +0000)] 
Skip this test on Darwin.  It's skipped on the trunk and is listed as
an expected skip in regrtest.py.  Make it so.

19 years agoIgnore pyo files
Neal Norwitz [Fri, 6 Jan 2006 05:25:01 +0000 (05:25 +0000)] 
Ignore pyo files

19 years agoBackport:
Neal Norwitz [Fri, 6 Jan 2006 04:40:20 +0000 (04:40 +0000)] 
Backport:
initscr() will exit if there's an error.  Try to catch the obvious failure
cases if TERM isn't set or is unknown (perhaps we should only check if
unset or empty?)

Skip the test if TERM isn't set.  This seems to occur when running under
buildbot and presumably cron.

For some more info check here:
http://mail.python.org/pipermail/python-checkins/2006-January/048704.html

19 years agobackport: squash compiler warning on Mac OSX 10.3
Skip Montanaro [Thu, 5 Jan 2006 10:51:18 +0000 (10:51 +0000)] 
backport: squash compiler warning on Mac OSX 10.3

19 years agoBackport 38951:
Neal Norwitz [Thu, 5 Jan 2006 08:00:55 +0000 (08:00 +0000)] 
Backport 38951:

fixes pybsddb SF bug id 1215432.  DB.associate() would crash when a
DBError was supposed to be raised.

19 years agoBackport: If the audio file does not exist, the test should be skipped.
Neal Norwitz [Thu, 5 Jan 2006 07:17:35 +0000 (07:17 +0000)] 
Backport: If the audio file does not exist, the test should be skipped.

19 years agoBackport: Skip test_curses if stdin is not a tty (like when run from cron or buildbot).
Neal Norwitz [Thu, 5 Jan 2006 06:10:16 +0000 (06:10 +0000)] 
Backport: Skip test_curses if stdin is not a tty (like when run from cron or buildbot).

19 years agoBackport: Fix errors on 64-bit platforms. (There are still some test problems
Neal Norwitz [Thu, 5 Jan 2006 05:45:12 +0000 (05:45 +0000)] 
Backport: Fix errors on 64-bit platforms.  (There are still some test problems

19 years agoBug #139571: wrong LaTeX label
Georg Brandl [Wed, 4 Jan 2006 21:04:24 +0000 (21:04 +0000)] 
Bug #139571: wrong LaTeX label

19 years agoIgnore .svn instead of CVS now.
Martin v. Löwis [Tue, 3 Jan 2006 06:30:40 +0000 (06:30 +0000)] 
Ignore .svn instead of CVS now.

19 years agobug #1395597: doc typo
Georg Brandl [Mon, 2 Jan 2006 22:07:25 +0000 (22:07 +0000)] 
bug #1395597: doc typo

19 years agomerge revision 41866 from trunk:
Fred Drake [Mon, 2 Jan 2006 07:25:08 +0000 (07:25 +0000)] 
merge revision 41866 from trunk:
update to reflect move to Subversion

19 years agoBug #1394868: doc typos
Georg Brandl [Sun, 1 Jan 2006 21:35:41 +0000 (21:35 +0000)] 
Bug #1394868: doc typos

19 years agoPatch by Ori Avtalion to fix a minor display glitch in the RightArrow.
Barry Warsaw [Sun, 1 Jan 2006 21:33:50 +0000 (21:33 +0000)] 
Patch by Ori Avtalion to fix a minor display glitch in the RightArrow.

I will port forward to 2.5.