summaryrefslogtreecommitdiffstats
path: root/Modules/Platform/OpenVMS.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-03-26 13:13:37 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-03-26 13:13:45 (GMT)
commit6257d43ffd18544a75596a2e21c2accc809d61c3 (patch)
tree6d507203b7b2340160fdafe0de2ff6c196521ac5 /Modules/Platform/OpenVMS.cmake
parent4e74a59ab55cf0c1332a61a379b79b9c6f1cf1d5 (diff)
parente565053bced999a90b95693c21dbe368990e01eb (diff)
downloadCMake-6257d43ffd18544a75596a2e21c2accc809d61c3.zip
CMake-6257d43ffd18544a75596a2e21c2accc809d61c3.tar.gz
CMake-6257d43ffd18544a75596a2e21c2accc809d61c3.tar.bz2
Merge topic 'compile-commands-collapse-whitespace'
e565053bce Ninja: Remove unnecessary newlines in compile commands 5d4bab500e Avoid consecutive whitespace in rules d8622fbd0f Modules: Collapse consecutive whitespace in strings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4512
Diffstat (limited to 'Modules/Platform/OpenVMS.cmake')
0 files changed, 0 insertions, 0 deletions
='width: 85.7%;'/>
3 files changed, 10 insertions, 10 deletions
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index df0b589..fc1525e 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -682,15 +682,15 @@ and :meth:`Semaphore` to create shared locks.)
for N in range(1, 1000, 10):
p.apply_async(factorial, (N, d))
- # Mark pool as closed -- no more tasks can be added.
- p.close()
+ # Mark pool as closed -- no more tasks can be added.
+ p.close()
- # Wait for tasks to exit
- p.join()
+ # Wait for tasks to exit
+ p.join()
- # Output results
- for k, v in sorted(d.items()):
- print k, v
+ # Output results
+ for k, v in sorted(d.items()):
+ print k, v
This will produce the output::
diff --git a/Lib/test/test_with.py b/Lib/test/test_with.py
index 105be8b..ae2fa4d 100644
--- a/Lib/test/test_with.py
+++ b/Lib/test/test_with.py
@@ -677,7 +677,7 @@ class NestedWith(unittest.TestCase):
if self.gobble:
return True
- class CtorRaises(object):
+ class InitRaises(object):
def __init__(self): raise RuntimeError()
class EnterRaises(object):
@@ -697,7 +697,7 @@ class NestedWith(unittest.TestCase):
def testExceptionInExprList(self):
try:
- with self.Dummy() as a, self.CtorRaises():
+ with self.Dummy() as a, self.InitRaises():
pass
except:
pass
diff --git a/Lib/traceback.py b/Lib/traceback.py