From: Georg Brandl <georg@python.org>
Date: Sun, 9 Mar 2014 10:17:23 +0000 (+0100)
Subject: merge with 3.3.5 release repo
X-Git-Tag: v3.4.1rc1~233^2~111^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e572fd490c625193e043ee6e8a9e54900e008b1;p=thirdparty%2FPython%2Fcpython.git

merge with 3.3.5 release repo
---

5e572fd490c625193e043ee6e8a9e54900e008b1
diff --cc Misc/NEWS
index 62211f47113c,2cb05f177d10..d0aec17f75d0
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,6 -2,26 +2,30 @@@
  Python News
  +++++++++++
  
+ What's New in Python 3.3.6 release candidate 1?
+ ===============================================
+ 
+ *Release date: XX-XXX-XXXX*
+ 
+ Core and Builtins
+ -----------------
+ 
+ Library
+ -------
+ 
++- Issue #20283: RE pattern methods now accept the string keyword parameters
++  as documented.  The pattern and source keyword parameters are left as
++  deprecated aliases.
++
+ 
+ What's New in Python 3.3.5?
+ ===========================
+ 
+ *Release date: 09-Mar-2014*
+ 
+ No changes from release candidate 2.
+ 
+ 
  What's New in Python 3.3.5 release candidate 2?
  ===============================================