diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-06-02 21:04:25 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-06-02 21:04:25 (GMT) |
| commit | e7e1375e5796263a9d7279dc247d4f6bb4243a46 (patch) | |
| tree | 646df46424c5d67295a5310fece1278b964949a8 /Lib/test/test_decimal.py | |
| parent | 2bc4d95bb67a0bcddec5b76e7f7b5d10b098aa49 (diff) | |
| parent | 66f29284797c31190ad06554d9909d7ed8a894d1 (diff) | |
| download | cpython-e7e1375e5796263a9d7279dc247d4f6bb4243a46.zip cpython-e7e1375e5796263a9d7279dc247d4f6bb4243a46.tar.gz cpython-e7e1375e5796263a9d7279dc247d4f6bb4243a46.tar.bz2 | |
Issue #18492: Merge with 3.4
Diffstat (limited to 'Lib/test/test_decimal.py')
| -rw-r--r-- | Lib/test/test_decimal.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py index 8072899..f8bb7eb 100644 --- a/Lib/test/test_decimal.py +++ b/Lib/test/test_decimal.py @@ -5556,7 +5556,7 @@ else: all_tests.insert(1, SignatureTest) -def test_main(arith=False, verbose=None, todo_tests=None, debug=None): +def test_main(arith=None, verbose=None, todo_tests=None, debug=None): """ Execute the tests. Runs all arithmetic tests if arith is True or if the "decimal" resource @@ -5566,7 +5566,7 @@ def test_main(arith=False, verbose=None, todo_tests=None, debug=None): init(C) init(P) global TEST_ALL, DEBUG - TEST_ALL = arith or is_resource_enabled('decimal') + TEST_ALL = arith if arith is not None else is_resource_enabled('decimal') DEBUG = debug if todo_tests is None: |