]> granicus.if.org Git - python/log
python
14 years agofollow on to the last commit, remove the final POSIXPurePythonTestCase
Gregory P. Smith [Sat, 28 May 2011 17:00:14 +0000 (10:00 -0700)]
follow on to the last commit, remove the final POSIXPurePythonTestCase
reference.  (the difference between running test_subprocess.py
directly rather than via regrtest.py)

14 years agoThe _posixsubprocess module is now required on POSIX.
Gregory P. Smith [Sat, 28 May 2011 16:32:39 +0000 (09:32 -0700)]
The _posixsubprocess module is now required on POSIX.
Remove the pure Python POSIX subprocess implementation.

If non-CPython VMs (are there any for 3.x yet?) were somehow depending
on this, they already have the exact same set of problems with Python
code being executed after os.fork() that _posixsubprocess was written
to deal with.  They should implement an equivalent outside of Python.

14 years agoFix ProcessTestCasePOSIXPurePython to test the module from import when
Gregory P. Smith [Sat, 28 May 2011 16:06:02 +0000 (09:06 -0700)]
Fix ProcessTestCasePOSIXPurePython to test the module from import when
_posixsubprocess doesn't exist rather than simply stubbing it out
after the fact.  This adds coverage for the RuntimeWarning as well as
using the pure python _create_pipe instead of using
_posixsubprocess.cloexec_pipe unintentionally with the pure python
code.

Ironically: I don't think any platform should ever actually _use_ the
pure Python subprocess code on POSIX platforms anymore.  This at least
tests it properly in this stable branch.  The pure python code for
this is likely to be removed in 3.3.

14 years agoIssue #11217: For 64-bit/32-bit Mac OS X universal framework builds,
Ned Deily [Sat, 28 May 2011 13:04:02 +0000 (06:04 -0700)]
Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds,
ensure "make install" creates symlinks in --prefix bin for the "-32"
files in the framework bin directory like the installer does.

14 years agoIssue #11217: For 64-bit/32-bit Mac OS X universal framework builds,
Ned Deily [Sat, 28 May 2011 12:59:55 +0000 (05:59 -0700)]
Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds,
ensure "make install" creates symlinks in --prefix bin for the "-32"
files in the framework bin directory like the installer does.

14 years agoIssue #985064: Make plistlib more resilient to faulty input plists.
Ned Deily [Sat, 28 May 2011 10:09:33 +0000 (03:09 -0700)]
Issue #985064: Make plistlib more resilient to faulty input plists.
Patch by Mher Movsisyan.

14 years agoIssue #985064: Make plistlib more resilient to faulty input plists.
Ned Deily [Sat, 28 May 2011 10:02:30 +0000 (03:02 -0700)]
Issue #985064: Make plistlib more resilient to faulty input plists.
Patch by Mher Movsisyan.

14 years agoIssue #985064: Make plistlib more resilient to faulty input plists.
Ned Deily [Sat, 28 May 2011 09:19:19 +0000 (02:19 -0700)]
Issue #985064: Make plistlib more resilient to faulty input plists.
Patch by Mher Movsisyan.

14 years agoIssue #9670: Increase the default stack size for secondary threads on
Ned Deily [Sat, 28 May 2011 07:45:52 +0000 (00:45 -0700)]
Issue #9670: Increase the default stack size for secondary threads on
Mac OS X and FreeBSD to reduce the chances of a crash instead of a
"maximum recursion depth" RuntimeError exception.
(patch by Ronald Oussoren)

14 years agoIssue #9670: Increase the default stack size for secondary threads on
Ned Deily [Sat, 28 May 2011 07:36:12 +0000 (00:36 -0700)]
Issue #9670: Increase the default stack size for secondary threads on
Mac OS X and FreeBSD to reduce the chances of a crash instead of a
"maximum recursion depth" RuntimeError exception.
(patch by Ronald Oussoren)

14 years agoIssue #9670: Increase the default stack size for secondary threads on
Ned Deily [Sat, 28 May 2011 07:19:56 +0000 (00:19 -0700)]
Issue #9670: Increase the default stack size for secondary threads on
Mac OS X and FreeBSD to reduce the chances of a crash instead of a
"maximum recursion depth" RuntimeError exception.
(patch by Ronald Oussoren)

14 years agoadd some with syntax examples
Benjamin Peterson [Fri, 27 May 2011 20:02:03 +0000 (15:02 -0500)]
add some with syntax examples

14 years agomerge 3.2
Benjamin Peterson [Fri, 27 May 2011 19:17:35 +0000 (14:17 -0500)]
merge 3.2

14 years agomerge 3.1
Benjamin Peterson [Fri, 27 May 2011 19:17:19 +0000 (14:17 -0500)]
merge 3.1

14 years agofix spacing
Benjamin Peterson [Fri, 27 May 2011 19:17:04 +0000 (14:17 -0500)]
fix spacing

14 years agomerge 3.2
Benjamin Peterson [Fri, 27 May 2011 19:12:53 +0000 (14:12 -0500)]
merge 3.2

14 years agomerge 3.1
Benjamin Peterson [Fri, 27 May 2011 19:10:36 +0000 (14:10 -0500)]
merge 3.1

14 years agofix indentation
Benjamin Peterson [Fri, 27 May 2011 19:10:24 +0000 (14:10 -0500)]
fix indentation

14 years agobump ast version
Benjamin Peterson [Fri, 27 May 2011 19:01:01 +0000 (14:01 -0500)]
bump ast version

14 years agoreflect with statements with multiple items in the AST (closes #12106)
Benjamin Peterson [Fri, 27 May 2011 18:58:08 +0000 (13:58 -0500)]
reflect with statements with multiple items in the AST (closes #12106)

14 years agoRevert my commit 3555cf6f9c98: "Issue #8796: codecs.open() calls the builtin
Victor Stinner [Fri, 27 May 2011 14:50:40 +0000 (16:50 +0200)]
Revert my commit 3555cf6f9c98: "Issue #8796: codecs.open() calls the builtin
open() function instead of using StreamReaderWriter. Deprecate StreamReader,
StreamWriter, StreamReaderWriter, StreamRecoder and EncodedFile() of the codec
module. Use the builtin open() function or io.TextIOWrapper instead."

"It has not been approved !" wrote Marc-Andre Lemburg.

14 years agoRevert my commit 7ba176c2f558: "Avoid useless "++" at the end of functions
Victor Stinner [Fri, 27 May 2011 14:46:51 +0000 (16:46 +0200)]
Revert my commit 7ba176c2f558: "Avoid useless "++" at the end of functions

Warnings found by the Clang Static Analyzer."

Most people prefer ++ at the end of functions.

14 years agotry to use the same str object for all code filenames when compiling or unmarshalling...
Benjamin Peterson [Fri, 27 May 2011 14:08:01 +0000 (09:08 -0500)]
try to use the same str object for all code filenames when compiling or unmarshalling (#12190)

This should reduce memory usage.

14 years agoremove unused string WILFE attribute
Benjamin Peterson [Fri, 27 May 2011 12:53:28 +0000 (07:53 -0500)]
remove unused string WILFE attribute

14 years agoMerge heads
Nadeem Vawda [Fri, 27 May 2011 00:03:06 +0000 (02:03 +0200)]
Merge heads

14 years agoUpdate bz2 docs following issue #1625.
Nadeem Vawda [Thu, 26 May 2011 23:52:16 +0000 (01:52 +0200)]
Update bz2 docs following issue #1625.

14 years agoIssue #1625: BZ2File and bz2.decompress() now support multi-stream files.
Nadeem Vawda [Thu, 26 May 2011 23:52:15 +0000 (01:52 +0200)]
Issue #1625: BZ2File and bz2.decompress() now support multi-stream files.

Initial patch by Nir Aides.

14 years agoIssue #8796: codecs.open() calls the builtin open() function instead of using
Victor Stinner [Thu, 26 May 2011 23:51:18 +0000 (01:51 +0200)]
Issue #8796: codecs.open() calls the builtin open() function instead of using
StreamReaderWriter. Deprecate StreamReader, StreamWriter, StreamReaderWriter,
StreamRecoder and EncodedFile() of the codec module. Use the builtin open()
function or io.TextIOWrapper instead.

14 years agofix typo
Benjamin Peterson [Thu, 26 May 2011 22:49:57 +0000 (17:49 -0500)]
fix typo

14 years agoMove test_packaging news entries to the tests section
Éric Araujo [Thu, 26 May 2011 15:06:47 +0000 (17:06 +0200)]
Move test_packaging news entries to the tests section

14 years agoadd ack from 2.7
Benjamin Peterson [Thu, 26 May 2011 14:59:17 +0000 (09:59 -0500)]
add ack from 2.7

14 years agoMerge 3.2
Éric Araujo [Thu, 26 May 2011 14:51:18 +0000 (16:51 +0200)]
Merge 3.2

14 years agoMerge 3.1
Éric Araujo [Thu, 26 May 2011 14:50:31 +0000 (16:50 +0200)]
Merge 3.1

14 years agoBranch merge
Éric Araujo [Thu, 26 May 2011 14:50:19 +0000 (16:50 +0200)]
Branch merge

14 years agoBranch merge
Éric Araujo [Thu, 26 May 2011 14:49:59 +0000 (16:49 +0200)]
Branch merge

14 years agoBranch merge
Éric Araujo [Thu, 26 May 2011 14:35:14 +0000 (16:35 +0200)]
Branch merge

14 years agoSystemExit_init(): avoid an useless test
Victor Stinner [Thu, 26 May 2011 12:25:54 +0000 (14:25 +0200)]
SystemExit_init(): avoid an useless test

Make silent a false positive of the Clang Static Analyzer.

14 years agoprint_exception(): handle correctly PyObject_GetAttrString() failure
Victor Stinner [Thu, 26 May 2011 12:25:13 +0000 (14:25 +0200)]
print_exception(): handle correctly PyObject_GetAttrString() failure

Bug found by the Clang Static Analyzer.

14 years agoset_repr(): handle correctly PyUnicode_FromUnicode() error (MemoryError)
Victor Stinner [Thu, 26 May 2011 12:24:30 +0000 (14:24 +0200)]
set_repr(): handle correctly PyUnicode_FromUnicode() error (MemoryError)

Bug found by the Clang Static Analyzer.

14 years ago_posixsubprocess.c: don't redefine _GNU_SOURCE if it's already defined
Victor Stinner [Thu, 26 May 2011 12:10:08 +0000 (14:10 +0200)]
_posixsubprocess.c: don't redefine _GNU_SOURCE if it's already defined

14 years agosocket.sendto(): exit directly after setting the error
Victor Stinner [Thu, 26 May 2011 12:05:59 +0000 (14:05 +0200)]
socket.sendto(): exit directly after setting the error

Dummy change to avoid a false positive with the Clang Static Analyzer.

14 years agozipimport: initialize fullpath to NULL
Victor Stinner [Thu, 26 May 2011 11:59:41 +0000 (13:59 +0200)]
zipimport: initialize fullpath to NULL

In some cases, fullpath value is used whereas fullpath was not always
initialized. Warning found by the Clang Static Analyzer.

14 years agoAvoid useless "++" at the end of functions
Victor Stinner [Thu, 26 May 2011 11:53:47 +0000 (13:53 +0200)]
Avoid useless "++" at the end of functions

Warnings found by the Clang Static Analyzer.

14 years agoRemove useless assignments
Victor Stinner [Thu, 26 May 2011 11:47:08 +0000 (13:47 +0200)]
Remove useless assignments

Warnings found by the the Clang Static Analyzer.

14 years agoNull merge: changeset is already in 3.3
Stefan Krah [Wed, 25 May 2011 22:38:51 +0000 (00:38 +0200)]
Null merge: changeset is already in 3.3

14 years agoIssue #12090: backport 79fcd71d0356
Stefan Krah [Wed, 25 May 2011 22:37:45 +0000 (00:37 +0200)]
Issue #12090: backport 79fcd71d0356

14 years agoIssue #12175: BufferedReader.read(-1) now calls raw.readall() if available.
Victor Stinner [Wed, 25 May 2011 22:19:38 +0000 (00:19 +0200)]
Issue #12175: BufferedReader.read(-1) now calls raw.readall() if available.

14 years agoIssue #12175: FileIO.readall() now only reads the file position and size once.
Victor Stinner [Wed, 25 May 2011 22:16:44 +0000 (00:16 +0200)]
Issue #12175: FileIO.readall() now only reads the file position and size once.

14 years agoIssue #12180: Fixed a few remaining errors in test_packaging when no threading.
Tarek Ziade [Wed, 25 May 2011 21:46:09 +0000 (23:46 +0200)]
Issue #12180: Fixed a few remaining errors in test_packaging when no threading.

14 years ago(Merge 3.2) Issue #12175: RawIOBase.readall() now returns None if read()
Victor Stinner [Wed, 25 May 2011 20:51:16 +0000 (22:51 +0200)]
(Merge 3.2) Issue #12175: RawIOBase.readall() now returns None if read()
returns None.

14 years ago(Merge 3.1) Issue #12175: RawIOBase.readall() now returns None if read()
Victor Stinner [Wed, 25 May 2011 20:49:15 +0000 (22:49 +0200)]
(Merge 3.1) Issue #12175: RawIOBase.readall() now returns None if read()
returns None.

14 years agoIssue #12175: RawIOBase.readall() now returns None if read() returns None.
Victor Stinner [Wed, 25 May 2011 20:47:16 +0000 (22:47 +0200)]
Issue #12175: RawIOBase.readall() now returns None if read() returns None.

14 years ago(Merge 3.2) Issue #12175: FileIO.readall() now raises a ValueError instead of
Victor Stinner [Wed, 25 May 2011 20:13:47 +0000 (22:13 +0200)]
(Merge 3.2) Issue #12175: FileIO.readall() now raises a ValueError instead of
an IOError if the file is closed.

14 years ago(Merge 3.1) Issue #12175: FileIO.readall() now raises a ValueError instead of
Victor Stinner [Wed, 25 May 2011 20:11:55 +0000 (22:11 +0200)]
(Merge 3.1) Issue #12175: FileIO.readall() now raises a ValueError instead of
an IOError if the file is closed.

14 years agoIssue #12175: FileIO.readall() now raises a ValueError instead of an IOError if
Victor Stinner [Wed, 25 May 2011 20:09:03 +0000 (22:09 +0200)]
Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError if
the file is closed.

14 years agoFast path for IncrementalNewlineDecoder.decode() in io.TextIOWrapper.read(-1)
Victor Stinner [Wed, 25 May 2011 20:01:33 +0000 (22:01 +0200)]
Fast path for IncrementalNewlineDecoder.decode() in io.TextIOWrapper.read(-1)

Copy/paste code from textiowrapper_read_chunk().

14 years agomerge commit.
Senthil Kumaran [Wed, 25 May 2011 16:26:32 +0000 (00:26 +0800)]
merge commit.

14 years agoNews entry for issue11109.
Senthil Kumaran [Wed, 25 May 2011 16:24:38 +0000 (00:24 +0800)]
News entry for issue11109.

14 years agoFix closes issue #11109 - socketserver.ForkingMixIn leaves zombies, also fails to...
Senthil Kumaran [Wed, 25 May 2011 16:22:59 +0000 (00:22 +0800)]
Fix closes issue #11109 -  socketserver.ForkingMixIn leaves zombies, also fails to reap all zombies in one pass.

A new method called service_action is made available in BaseServer, called by
serve_forever loop. This useful in cases where Mixins can use it for cleanup
action. ForkingMixin class uses service_action to collect the zombie child
processes. Initial Patch by Justin Wark.

14 years agoMerge 3.2
Éric Araujo [Wed, 25 May 2011 16:22:26 +0000 (18:22 +0200)]
Merge 3.2

14 years agoBranch merge
Éric Araujo [Wed, 25 May 2011 16:22:11 +0000 (18:22 +0200)]
Branch merge

14 years agoMinor cleanup in sysconfig.
Éric Araujo [Wed, 25 May 2011 16:21:43 +0000 (18:21 +0200)]
Minor cleanup in sysconfig.

Also remove outdated and unhelpful docstrings in test_sysconfig.

14 years agoIssue #12045: Avoid duplicate execution of command in ctypes.util._get_soname().
Antoine Pitrou [Wed, 25 May 2011 16:17:25 +0000 (18:17 +0200)]
Issue #12045: Avoid duplicate execution of command in ctypes.util._get_soname().
Patch by Sijin Joseph.

14 years agoMerge 3.1
Éric Araujo [Wed, 25 May 2011 16:13:49 +0000 (18:13 +0200)]
Merge 3.1

14 years agoFix two typos
Éric Araujo [Wed, 25 May 2011 16:13:29 +0000 (18:13 +0200)]
Fix two typos

14 years agoBranch merge
Éric Araujo [Wed, 25 May 2011 16:12:22 +0000 (18:12 +0200)]
Branch merge

14 years agotest that object has a __dir__() implementation
Benjamin Peterson [Wed, 25 May 2011 14:33:37 +0000 (09:33 -0500)]
test that object has a __dir__() implementation

14 years agomake PyImport_ImportModuleLevel's first arg const like similiar functions (closes...
Benjamin Peterson [Wed, 25 May 2011 14:29:00 +0000 (09:29 -0500)]
make PyImport_ImportModuleLevel's first arg const like similiar functions (closes #12173)

14 years agowrap at 80 chars
Benjamin Peterson [Wed, 25 May 2011 14:27:43 +0000 (09:27 -0500)]
wrap at 80 chars

14 years agotest values and types of (True/False).(imag/real)
Benjamin Peterson [Wed, 25 May 2011 14:21:46 +0000 (09:21 -0500)]
test values and types of (True/False).(imag/real)

14 years agoIssue #12049: cleanup the warning in the random module doc
Victor Stinner [Wed, 25 May 2011 11:13:55 +0000 (13:13 +0200)]
Issue #12049: cleanup the warning in the random module doc

14 years agoIssue #12049: Document errors cases of ssl.RAND_bytes() and
Victor Stinner [Wed, 25 May 2011 09:27:40 +0000 (11:27 +0200)]
Issue #12049: Document errors cases of ssl.RAND_bytes() and
ssl.RAND_pseudo_bytes().  Add also links to RAND_status and RAND_add.

14 years agoIssue #12049: test_ssl now checks also that RAND_bytes() raises an error if
Victor Stinner [Wed, 25 May 2011 09:15:16 +0000 (11:15 +0200)]
Issue #12049: test_ssl now checks also that RAND_bytes() raises an error if
there is not enough entropy.

14 years agoIssue #8407: Fix the signal handler of the signal module: if it is called
Victor Stinner [Wed, 25 May 2011 00:35:58 +0000 (02:35 +0200)]
Issue #8407: Fix the signal handler of the signal module: if it is called
twice, it now writes the number of the second signal into the wakeup fd.

14 years agoexcellent place for assertRaises
Benjamin Peterson [Wed, 25 May 2011 00:31:01 +0000 (19:31 -0500)]
excellent place for assertRaises

14 years agoIssue #8533: regrtest replaces also sys.stdout on Windows
Victor Stinner [Wed, 25 May 2011 00:01:55 +0000 (02:01 +0200)]
Issue #8533: regrtest replaces also sys.stdout on Windows

Replace sys.stdout to use backslashreplace. Use '\n' newline on all operating
systems.

14 years agoIssue #10818: Remove deprecated pydoc.serve() function
Victor Stinner [Tue, 24 May 2011 23:41:22 +0000 (01:41 +0200)]
Issue #10818: Remove deprecated pydoc.serve() function

The pydoc module has a new enhanced web server.

14 years agoIssue #10818: Remove the Tk GUI of the pydoc module (pydoc -g has been
Victor Stinner [Tue, 24 May 2011 23:35:05 +0000 (01:35 +0200)]
Issue #10818: Remove the Tk GUI of the pydoc module (pydoc -g has been
deprecated in Python 3.2).

14 years ago(Merge 3.2) Issue #12057: Add cjkencodings directory to the Makefile and
Victor Stinner [Tue, 24 May 2011 23:16:49 +0000 (01:16 +0200)]
(Merge 3.2) Issue #12057: Add cjkencodings directory to the Makefile and
Tools/msi/msi.py

14 years ago(Merge 3.1) Issue #12057: Add cjkencodings directory to the Makefile and
Victor Stinner [Tue, 24 May 2011 23:15:59 +0000 (01:15 +0200)]
(Merge 3.1) Issue #12057: Add cjkencodings directory to the Makefile and
Tools/msi/msi.py

14 years agoIssue #12057: Add cjkencodings directory to the Makefile and Tools/msi/msi.py
Victor Stinner [Tue, 24 May 2011 23:13:59 +0000 (01:13 +0200)]
Issue #12057: Add cjkencodings directory to the Makefile and Tools/msi/msi.py

14 years agoFix typo in bz2 module.
Nadeem Vawda [Tue, 24 May 2011 22:32:08 +0000 (00:32 +0200)]
Fix typo in bz2 module.

14 years ago(Merge 3.2) Issue #12057: Add tests for the HZ encoding
Victor Stinner [Tue, 24 May 2011 22:17:13 +0000 (00:17 +0200)]
(Merge 3.2) Issue #12057: Add tests for the HZ encoding

14 years ago(Merge 3.1) Issue #12057: Add tests for the HZ encoding
Victor Stinner [Tue, 24 May 2011 22:16:43 +0000 (00:16 +0200)]
(Merge 3.1) Issue #12057: Add tests for the HZ encoding

14 years agoIssue #12057: Add tests for the HZ encoding
Victor Stinner [Tue, 24 May 2011 22:06:51 +0000 (00:06 +0200)]
Issue #12057: Add tests for the HZ encoding

14 years agoIssue #1441530: In imaplib, read the data in one chunk to speed up large
Charles-François Natali [Tue, 24 May 2011 21:47:49 +0000 (23:47 +0200)]
Issue #1441530: In imaplib, read the data in one chunk to speed up large
reads and simplify code.

14 years ago(Merge 3.2) Issue #12070: Fix the Makefile parser of the sysconfig module to
Victor Stinner [Tue, 24 May 2011 21:38:03 +0000 (23:38 +0200)]
(Merge 3.2) Issue #12070: Fix the Makefile parser of the sysconfig module to
handle correctly references to "bogus variable" (e.g. "prefix=$/opt/python").

14 years agoIssue #12070: Fix the Makefile parser of the sysconfig module to handle
Victor Stinner [Tue, 24 May 2011 21:37:07 +0000 (23:37 +0200)]
Issue #12070: Fix the Makefile parser of the sysconfig module to handle
correctly references to "bogus variable" (e.g. "prefix=$/opt/python").

14 years ago(Merge 3.2) Issue #12100: Don't reset incremental encoders of CJK codecs at
Victor Stinner [Tue, 24 May 2011 20:24:11 +0000 (22:24 +0200)]
(Merge 3.2) Issue #12100: Don't reset incremental encoders of CJK codecs at
each call to their encode() method anymore, but continue to call the reset()
method if the final argument is True.

14 years ago(Merge 3.1) Issue #12100: Don't reset incremental encoders of CJK codecs at
Victor Stinner [Tue, 24 May 2011 20:22:17 +0000 (22:22 +0200)]
(Merge 3.1) Issue #12100: Don't reset incremental encoders of CJK codecs at
each call to their encode() method anymore, but continue to call the reset()
method if the final argument is True.

14 years agoIssue #12100: Don't reset incremental encoders of CJK codecs at each call to
Victor Stinner [Tue, 24 May 2011 20:17:55 +0000 (22:17 +0200)]
Issue #12100: Don't reset incremental encoders of CJK codecs at each call to
their encode() method anymore, but continue to call the reset() method if the
final argument is True.

14 years agoIssue #12049: improve RAND_bytes() and RAND_pseudo_bytes() documentation
Victor Stinner [Tue, 24 May 2011 19:32:40 +0000 (21:32 +0200)]
Issue #12049: improve RAND_bytes() and RAND_pseudo_bytes() documentation

Add also a security warning in the module random pointing to ssl.RAND_bytes().

14 years agomerge 3.2
Benjamin Peterson [Tue, 24 May 2011 17:51:32 +0000 (12:51 -0500)]
merge 3.2

14 years agomerge 3.1
Benjamin Peterson [Tue, 24 May 2011 17:51:24 +0000 (12:51 -0500)]
merge 3.1

14 years agobackout 8b384de4e780, so a proper fix can be considered (#5715)
Benjamin Peterson [Tue, 24 May 2011 17:50:34 +0000 (12:50 -0500)]
backout 8b384de4e780, so a proper fix can be considered (#5715)

14 years agoindicate return value on __dir__ methods
Benjamin Peterson [Tue, 24 May 2011 17:46:15 +0000 (12:46 -0500)]
indicate return value on __dir__ methods

14 years agomerge 3.2
Benjamin Peterson [Tue, 24 May 2011 17:45:33 +0000 (12:45 -0500)]
merge 3.2

14 years agomerge 3.1
Benjamin Peterson [Tue, 24 May 2011 17:44:26 +0000 (12:44 -0500)]
merge 3.1

14 years agouse '->' to indicate return values
Benjamin Peterson [Tue, 24 May 2011 17:42:51 +0000 (12:42 -0500)]
use '->' to indicate return values

14 years agomerge 3.2
Benjamin Peterson [Tue, 24 May 2011 17:09:47 +0000 (12:09 -0500)]
merge 3.2