From: Éric Araujo <merwok@netwok.org>
Date: Thu, 3 Nov 2011 15:44:13 +0000 (+0100)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~967
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=146f870916539eb2e7b9273eb8ff978bc55ec961;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

146f870916539eb2e7b9273eb8ff978bc55ec961
diff --cc Misc/NEWS
index 11f98a7f47ab,d58da6a1acf2..b46cea822ec1
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -350,15 -350,14 +350,19 @@@ Core and Builtin
  Library
  -------
  
+ - Byte compilation in packaging is now isolated from the calling Python -B or
+   -O options, instead of being disallowed under -B or buggy under -O.
+ 
 +- Issue #10570: curses.tigetstr() is now expecting a byte string, instead of
 +  a Unicode string.
 +
 +- Issue #13295: http.server now produces valid HTML 4.01 strict.
 +
  - Issue #2892: preserve iterparse events in case of SyntaxError.
  
- - Issue #13287: urllib.request and urllib.error now contains a __all__ and
-   exposes only relevant Classes, Functions. Patch by Florent Xicluna.
+ - Issue #13287: urllib.request and urllib.error now contains an __all__
 -  attribute to expose only public classes and functions.  Patch by Florent
++  attribute to expose only relevant classes and functions.  Patch by Florent
+   Xicluna.
  
  - Issue #670664: Fix HTMLParser to correctly handle the content of
    ``<script>...</script>`` and ``<style>...</style>``.