From: Robert Collins Date: Wed, 29 Jul 2015 18:14:32 +0000 (+1200) Subject: Issue #23589: Remove duplicate sentence from the FAQ. Patch by Yongzhi Pan. X-Git-Tag: v2.7.11rc1~217 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f524799a652fc9086ad61537906d02702fb18280;p=thirdparty%2FPython%2Fcpython.git Issue #23589: Remove duplicate sentence from the FAQ. Patch by Yongzhi Pan. --- diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index 588066dbc5e2..23891be14f90 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -333,10 +333,8 @@ What are the rules for local and global variables in Python? ------------------------------------------------------------ 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 index 65bb83796172..9979c69bfa59 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -136,6 +136,8 @@ IDLE Documentation ------------- +- Issue #23589: Remove duplicate sentence from the FAQ. Patch by Yongzhi Pan. + - Issue #22155: Add File Handlers subsection with createfilehandler to Tkinter doc. Remove obsolete example from FAQ. Patch by Martin Panter.