[Python-checkins] cpython (merge 3.5 -> 3.6): Merge from 3.5

Mon Sep 26 15:43:03 EDT 2016

https://hg.python.org/cpython/rev/927a08d380c7
changeset: 104071:927a08d380c7
branch: 3.6
parent: 104068:1d41d741bb5b
parent: 104070:92f59d8130cc
user: Berker Peksag <berker.peksag at gmail.com>
date: Mon Sep 26 22:44:32 2016 +0300
summary:
 Merge from 3.5
files:
 Doc/library/os.rst | 3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -243,6 +243,9 @@
 Return the value of the environment variable *key* if it exists, or
 *default* if it doesn't. *key*, *default* and the result are bytes.
 
+ :func:`getenvb` is only available if :data:`supports_bytes_environ`
+ is True.
+
 Availability: most flavors of Unix.
 
 .. versionadded:: 3.2
-- 
Repository URL: https://hg.python.org/cpython
