merge 3.3 (closes #20892)

This commit is contained in:
Benjamin Peterson 2014-03-11 13:59:48 -05:00
commit 162d7ca3cc

View file

@ -111,7 +111,7 @@ between Python 2 and 3 easier.
Projects to Consider Projects to Consider
-------------------- --------------------
The lowest level library for suppoting Python 2 & 3 simultaneously is six_. The lowest level library for supporting Python 2 & 3 simultaneously is six_.
Reading through its documentation will give you an idea of where exactly the Reading through its documentation will give you an idea of where exactly the
Python language changed between versions 2 & 3 and thus what you will want the Python language changed between versions 2 & 3 and thus what you will want the
library to help you continue to support. library to help you continue to support.