]> granicus.if.org Git - python/commitdiff
Closes #17540: Merged fix from 3.3.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 29 Mar 2013 17:59:15 +0000 (17:59 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 29 Mar 2013 17:59:15 +0000 (17:59 +0000)
1  2 
Lib/logging/config.py
Lib/test/test_logging.py
Misc/NEWS

Simple merge
Simple merge
diff --cc Misc/NEWS
index de80e5fadfcffa7061346b8be6163082ec24c5bc,8c016a4c80d95d2be8d32143185d39ad74e4ca44..5c2879ade9dc29852388db9e65320eb7cc405f57
+++ b/Misc/NEWS
@@@ -297,11 -200,8 +297,13 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #17540: Added style to formatter configuration by dict.
 +- Issue #16692: The ssl module now supports TLS 1.1 and TLS 1.2.  Initial
 +  patch by Michele OrrĂ¹.
 +
 +- Issue #17025: multiprocessing: Reduce Queue and SimpleQueue contention.
 +
  - Issue #17536: Add to webbrowser's browser list: www-browser, x-www-browser,
    iceweasel, iceape.