From: Petri Lehtinen <petri@digip.org>
Date: Thu, 2 Feb 2012 19:23:15 +0000 (+0200)
Subject: Merge branch 3.2
X-Git-Tag: v3.3.0a1~266
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b0eab62f04fc2e738b1bff1d170c7f6f96c1920;p=thirdparty%2FPython%2Fcpython.git

Merge branch 3.2

Closes #13402.
---

4b0eab62f04fc2e738b1bff1d170c7f6f96c1920
diff --cc Misc/NEWS
index b005e9347448,0f0479c14f68..f00738bc9467
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2147,19 -1382,6 +2147,21 @@@ C-AP
  Documentation
  -------------
  
++- Issue #13402: Document absoluteness of sys.executable.
++
 +- Issue #13883: PYTHONCASEOK also works on OS X.
 +
 +- Issue #12949: Document the kwonlyargcount argument for the PyCode_New
 +  C API function.
 +
 +- Issue #13513: Fix io.IOBase documentation to correctly link to the
 +  io.IOBase.readline method instead of the readline module.
 +
 +- Issue #13237: Reorganise subprocess documentation to emphasise convenience
 +  functions and the most commonly needed arguments to Popen.
 +
 +- Issue #13141: Demonstrate recommended style for socketserver examples.
 +
  - Issue #11818: Fix tempfile examples for Python 3.
  
  
diff --cc Python/sysmodule.c
index d1517d33f6c1,8a659c5e460a..955219f22888
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@@ -1254,21 -1252,21 +1254,21 @@@ PyDoc_STR
  "\n\
  Static objects:\n\
  \n\
 -float_info -- a dict with information about the float implementation.\n\
 -int_info -- a struct sequence with information about the int implementation.\n\
 -maxsize -- the largest supported length of containers.\n\
 -maxunicode -- the largest supported character\n\
  builtin_module_names -- tuple of module names built into this interpreter\n\
 -subversion -- subversion information of the build as tuple\n\
 -version -- the version of this interpreter as a string\n\
 -version_info -- version information as a named tuple\n\
 -hexversion -- version information encoded as a single integer\n\
  copyright -- copyright notice pertaining to this interpreter\n\
 -platform -- platform identifier\n\
 -executable -- absolute path of the executable binary of the Python interpreter\n\
 -prefix -- prefix used to find the Python library\n\
  exec_prefix -- prefix used to find the machine-specific Python library\n\
- executable -- pathname of this Python interpreter\n\
++executable -- absolute path of the executable binary of the Python interpreter\n\
 +float_info -- a struct sequence with information about the float implementation.\n\
  float_repr_style -- string indicating the style of repr() output for floats\n\
 +hexversion -- version information encoded as a single integer\n\
 +int_info -- a struct sequence with information about the int implementation.\n\
 +maxsize -- the largest supported length of containers.\n\
 +maxunicode -- the value of the largest Unicode codepoint\n\
 +platform -- platform identifier\n\
 +prefix -- prefix used to find the Python library\n\
 +thread_info -- a struct sequence with information about the thread implementation.\n\
 +version -- the version of this interpreter as a string\n\
 +version_info -- version information as a named tuple\n\
  "
  )
  #ifdef MS_WINDOWS