From: Stefan Krah <skrah@bytereef.org>
Date: Sat, 15 Dec 2012 21:36:49 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1847
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8031d0dfd4c79509badaf960b3aba1dbdba94cbd;p=python

Merge 3.3.
---

8031d0dfd4c79509badaf960b3aba1dbdba94cbd
diff --cc Misc/NEWS
index d52a9d8159,e396da9e8f..3135c33609
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -167,12 -108,10 +167,16 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #15783: Except for the number methods, the C version of decimal now
+   supports all None default values present in decimal.py. These values were
+   largely undocumented.
+ 
 +- Issue #11175: argparse.FileType now accepts encoding and errors
 +  arguments. Patch by Lucas Maystre.
 +
 +- Issue #16488: epoll() objects now support the `with` statement.  Patch
 +  by Serhiy Storchaka.
 +
  - Issue #16298: In HTTPResponse.read(), close the socket when there is no
    Content-Length and the incoming stream is finished.  Patch by Eran
    Rundstein.