From: Senthil Kumaran <senthil@uthcode.com>
Date: Thu, 9 Feb 2012 10:27:48 +0000 (+0800)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~206
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0f9679d5ce6b65f4b41f1c42b24c6ab43923a41;p=python

merge from 3.2

Issue #9021 - Introduce copy module better in the docs.
---

f0f9679d5ce6b65f4b41f1c42b24c6ab43923a41
diff --cc Misc/NEWS
index 7fe19e04cd,487b46fac0..146cbb5c98
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -466,24 -113,8 +466,26 @@@ Core and Builtin
  Library
  -------
  
 +- When '' is a path (e.g. in sys.path), make sure __file__ uses the current
 +  working directory instead of '' in importlib.
 +
 +- Issue #13609: Add two functions to query the terminal size:
 +  os.get_terminal_size (low level) and shutil.get_terminal_size (high level).
 +  Patch by Zbigniew Jędrzejewski-Szmek.
 +
 +- Issue #13845: On Windows, time.time() now uses GetSystemTimeAsFileTime()
 +  instead of ftime() to have a resolution of 100 ns instead of 1 ms (the clock
 +  accuracy is between 0.5 ms and 15 ms).
 +
 +- Issue #13846: Add time.monotonic(), monotonic clock.
 +
 +- Issue #8184: multiprocessing: On Windows, don't set SO_REUSEADDR on
 +  Connection sockets, and set FILE_FLAG_FIRST_PIPE_INSTANCE on named pipes, to
 +  make sure two listeners can't bind to the same socket/pipe (or any existing
 +  socket/pipe).
 +
+ - Issue #9021: Add an introduction to the copy module documentation.
+ 
  - Issue #6005: Examples in the socket library documentation use sendall, where
    relevant, instead send method.