[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #23589: Remove duplicate sentence from the FAQ. Patch by Yongzhi Pan.

[robert.collins]

https://hg.python.org/cpython/rev/93f3ca8fdc39
changeset:   97129:93f3ca8fdc39
branch:      3.5
parent:      97125:f83864dd6e40
parent:      97128:941b9c27b8c8
user:        Robert Collins <rbtcollins at hp.com>
date:        Thu Jul 30 06:16:46 2015 +1200
summary:
  Issue #23589: Remove duplicate sentence from the FAQ.  Patch by Yongzhi Pan.

files:
  Doc/faq/programming.rst |  6 ++----
  Misc/NEWS               |  5 +++++
  2 files changed, 7 insertions(+), 4 deletions(-)


diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -187,10 +187,8 @@
 ------------------------------------------------------------
 
 In Python, variables that are only referenced inside a function are implicitly
-global.  If a variable is assigned a new value anywhere within the function's
-body, it's assumed to be a local.  If a variable is ever assigned a new value
-inside the function, the variable is implicitly local, and you need to
-explicitly declare it as 'global'.
+global.  If a variable is assigned a value anywhere within the function's body,
+it's assumed to be a local unless explicitly declared as global.
 
 Though a bit surprising at first, a moment's consideration explains this.  On
 one hand, requiring :keyword:`global` for assigned variables provides a bar
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,6 +23,11 @@
 
 - Issue #17527: Add PATCH to wsgiref.validator. Patch from Luca Sbardella.
 
+Documentation
+-------------
+
+- Issue #23589: Remove duplicate sentence from the FAQ.  Patch by Yongzhi Pan.
+
 
 What's New in Python 3.5.0 beta 4?
 ==================================

-- 
Repository URL: https://hg.python.org/cpython