From: Guido van Rossum <guido@python.org>
Date: Fri, 22 Jun 2012 22:18:38 +0000 (-0700)
Subject: Merge
X-Git-Tag: v3.3.0b1~154
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e0d25504c5a7309bdebda33b3aa9b8213896907;p=python

Merge
---

8e0d25504c5a7309bdebda33b3aa9b8213896907
diff --cc Misc/NEWS
index 70258dcd05,adcbc727ff..48baa45f33
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -40,8 -40,14 +40,16 @@@ Core and Builtin
  Library
  -------
  
 +- Issue: #15138: base64.urlsafe_{en,de}code() are now 3-4x faster.
 +
+ - Issue #444582: Add shutil.which, for finding programs on the system path.
+   Original patch by Erik Demaine, with later iterations by Jan Killian
+   and Brian Curtin.
+ 
+ - Issue #14837: SSL errors now have ``library`` and ``reason`` attributes
+   describing precisely what happened and in which OpenSSL submodule.  The
+   str() of a SSLError is also enhanced accordingly.
+ 
  - Issue #9527: datetime.astimezone() method will now supply a class
    timezone instance corresponding to the system local timezone when
    called with no arguments.