diff options
| author | Gregory P. Smith <greg@krypto.org> | 2013-11-25 08:32:20 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2013-11-25 08:32:20 (GMT) |
| commit | 1b28be4330f47093e24bbeeb396a99654715641f (patch) | |
| tree | 0a57eb5fcae148ef3eb3730b528aaaae4888a1e9 | |
| parent | 65482570f1fa660bd95e1daf4ecc6acd65f0d34e (diff) | |
| parent | a89ecc7d237c3f409afbbee4d736fadfda810a18 (diff) | |
| download | cpython-1b28be4330f47093e24bbeeb396a99654715641f.zip cpython-1b28be4330f47093e24bbeeb396a99654715641f.tar.gz cpython-1b28be4330f47093e24bbeeb396a99654715641f.tar.bz2 | |
merge heads
| -rw-r--r-- | Lib/test/test_tracemalloc.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/test/test_tracemalloc.py b/Lib/test/test_tracemalloc.py index 1d15667..f1352e3 100644 --- a/Lib/test/test_tracemalloc.py +++ b/Lib/test/test_tracemalloc.py @@ -1,6 +1,4 @@ -import _tracemalloc import contextlib -import datetime import os import sys import tracemalloc @@ -207,7 +205,7 @@ class TestTracemallocEnabled(unittest.TestCase): size, max_size = tracemalloc.get_traced_memory() self.assertGreater(size, 0) - # stop() rests also traced memory counters + # stop() also resets traced memory counters tracemalloc.stop() self.assertEqual(tracemalloc.get_traced_memory(), (0, 0)) @@ -729,7 +727,7 @@ class TestCommandLine(unittest.TestCase): stdout = stdout.rstrip() self.assertEqual(stdout, b'False') - # PYTHON* environment varibles must be ignored when -E option is + # PYTHON* environment variables must be ignored when -E option is # present code = 'import tracemalloc; print(tracemalloc.is_tracing())' ok, stdout, stderr = assert_python_ok('-E', '-c', code, PYTHONTRACEMALLOC='1') |