cpython: 0d77a17567a4 (original) (raw)
Mercurial > cpython
changeset 100445:0d77a17567a4
Issue #26505: merge from 3.5 [#26505]
| Ned Deily nad@python.org | |
|---|---|
| date | Mon, 07 Mar 2016 14:52:46 -0500 |
| parents | ee1d44f7d3e7(current diff)a6b07ad3d14d(diff) |
| children | 8fecf6e17616 |
| files | Misc/ACKS Modules/getaddrinfo.c |
| diffstat | 3 files changed, 9 insertions(+), 8 deletions(-)[+] [-] Doc/license.rst 8 Misc/ACKS 1 Modules/getaddrinfo.c 8 |
line wrap: on
line diff
--- a/Doc/license.rst +++ b/Doc/license.rst @@ -337,14 +337,14 @@ Project, http://www.wide.ad.jp/. :: without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON GAI_ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN GAI_ANY WAY
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/Misc/ACKS +++ b/Misc/ACKS @@ -1582,6 +1582,7 @@ Sue Williams Carol Willing Steven Willis Frank Willison +Alex Willmer David Wilson Geoff Wilson Greg V. Wilson
--- a/Modules/getaddrinfo.c +++ b/Modules/getaddrinfo.c @@ -15,14 +15,14 @@