From: Martin Panter <vadmium+py@gmail.com>
Date: Wed, 8 Jun 2016 13:32:49 +0000 (+0000)
Subject: Fix RST conflicts with Idle news entries
X-Git-Tag: v3.6.0a2~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b198c42bcb8a9d7ccf4da0218b6ad6adc5beadfb;p=thirdparty%2FPython%2Fcpython.git

Fix RST conflicts with Idle news entries
---

diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv
index c394af335a07..46cc2f17ab61 100644
--- a/Doc/tools/susp-ignored.csv
+++ b/Doc/tools/susp-ignored.csv
@@ -272,6 +272,7 @@ whatsnew/3.2,,:feed,>>> urllib.parse.urlparse('http://[dead:beef:cafe:5417:affe:
 whatsnew/3.2,,:gz,">>> with tarfile.open(name='myarchive.tar.gz', mode='w:gz') as tf:"
 whatsnew/3.2,,:location,zope9-location = ${zope9:location}
 whatsnew/3.2,,:prefix,zope-conf = ${custom:prefix}/etc/zope.conf
+whatsnew/changelog,,:version,import sys; I = version[:version.index(' ')]
 whatsnew/changelog,,:gz,": TarFile opened with external fileobj and ""w:gz"" mode didn't"
 whatsnew/changelog,,::,": Use ""127.0.0.1"" or ""::1"" instead of ""localhost"" as much as"
 library/tarfile,149,:xz,'x:xz'
diff --git a/Misc/NEWS b/Misc/NEWS
index b31120734f9b..6f71c268b8cb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -113,22 +113,22 @@ IDLE
 - Issue #20567: Revise idle_test/README.txt with advice about avoiding
   tk warning messages from tests.  Apply advice to several IDLE tests.
 
-- Issue # 24225: Update idlelib/README.txt with new file names
+- Issue #24225: Update idlelib/README.txt with new file names
   and event handlers.
 
 - Issue #27156: Remove obsolete code not used by IDLE.  Replacements:
   1. help.txt, replaced by help.html, is out-of-date and should not be used.
   Its dedicated viewer has be replaced by the html viewer in help.py.
-  2. 'import idlever; I = idlever.IDLE_VERSION' is the same as
-  'import sys; I = version[:version.index(' ')]'
-  3. After 'ob = stackviewer.VariablesTreeItem(*args)',
-  'ob.keys()' == 'list(ob.object.keys).
+  2. ‘`import idlever; I = idlever.IDLE_VERSION`’ is the same as
+  ‘`import sys; I = version[:version.index(' ')]`’
+  3. After ‘`ob = stackviewer.VariablesTreeItem(*args)`’,
+  ‘`ob.keys() == list(ob.object.keys)`’.
   4. In macosc, runningAsOSXAPP == isAquaTk; idCarbonAquaTk == isCarbonTk
 
 - Issue #27117: Make colorizer htest and turtledemo work with dark themes.
   Move code for configuring text widget colors to a new function.
 
-- Issue #24225: Rename many idlelib/*.py and idle_test/test_*.py files.
+- Issue #24225: Rename many `idlelib/*.py` and `idle_test/test_*.py` files.
   Edit files to replace old names with new names when the old name
   referred to the module rather than the class it contained.
   See the issue and IDLE section in What's New in 3.6 for more.