diff options
-rw-r--r-- | Lib/argparse.py | 5 | ||||
-rw-r--r-- | Lib/test/test_argparse.py | 18 | ||||
-rw-r--r-- | Misc/NEWS | 3 | ||||
-rw-r--r-- | Python/random.c | 3 |
4 files changed, 27 insertions, 2 deletions
diff --git a/Lib/argparse.py b/Lib/argparse.py index a73845594f..ab8ff2faec 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -1692,9 +1692,12 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer): return args def parse_known_args(self, args=None, namespace=None): - # args default to the system args if args is None: + # args default to the system args args = _sys.argv[1:] + else: + # make sure that args are mutable + args = list(args) # default Namespace built from parser defaults if namespace is None: diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py index 77f5aca21e..99c1babb4a 100644 --- a/Lib/test/test_argparse.py +++ b/Lib/test/test_argparse.py @@ -4486,6 +4486,24 @@ class TestTypeFunctionCallWithNonStringDefault(TestCase): class TestParseKnownArgs(TestCase): + def test_arguments_tuple(self): + parser = argparse.ArgumentParser() + parser.parse_args(()) + + def test_arguments_list(self): + parser = argparse.ArgumentParser() + parser.parse_args([]) + + def test_arguments_tuple_positional(self): + parser = argparse.ArgumentParser() + parser.add_argument('x') + parser.parse_args(('x',)) + + def test_arguments_list_positional(self): + parser = argparse.ArgumentParser() + parser.add_argument('x') + parser.parse_args(['x']) + def test_optionals(self): parser = argparse.ArgumentParser() parser.add_argument('--foo') @@ -103,6 +103,9 @@ Core and Builtins Library ------- +- Issue #15340: Fix importing the random module when /dev/urandom cannot + be opened. This was a regression caused by the hash randomization patch. + - Issue #15841: The readable(), writable() and seekable() methods of io.BytesIO and io.StringIO objects now raise ValueError when the object has been closed. Patch by Alessandro Moura. diff --git a/Python/random.c b/Python/random.c index a2ae002261..825260f36b 100644 --- a/Python/random.c +++ b/Python/random.c @@ -165,7 +165,8 @@ dev_urandom_python(char *buffer, Py_ssize_t size) Py_END_ALLOW_THREADS if (fd < 0) { - PyErr_SetFromErrnoWithFilename(PyExc_OSError, "/dev/urandom"); + PyErr_SetString(PyExc_NotImplementedError, + "/dev/urandom (or equivalent) not found"); return -1; } |