mirror of https://github.com/python/cpython
Merge Python 3.5.0b4 changes back with 3.5 branch head.
This commit is contained in:
commit
71427eea74
|
@ -39,6 +39,12 @@ class TestSeparators:
|
||||||
self.assertEqual(h2, h)
|
self.assertEqual(h2, h)
|
||||||
self.assertEqual(d2, expect)
|
self.assertEqual(d2, expect)
|
||||||
|
|
||||||
|
def test_illegal_separators(self):
|
||||||
|
h = {1: 2, 3: 4}
|
||||||
|
self.assertRaises(TypeError, self.dumps, h, separators=(b', ', ': '))
|
||||||
|
self.assertRaises(TypeError, self.dumps, h, separators=(', ', b': '))
|
||||||
|
self.assertRaises(TypeError, self.dumps, h, separators=(b', ', b': '))
|
||||||
|
|
||||||
|
|
||||||
class TestPySeparators(TestSeparators, PyTest): pass
|
class TestPySeparators(TestSeparators, PyTest): pass
|
||||||
class TestCSeparators(TestSeparators, CTest): pass
|
class TestCSeparators(TestSeparators, CTest): pass
|
||||||
|
|
|
@ -40,6 +40,9 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #24683: Fixed crashes in _json functions called with arguments of
|
||||||
|
inappropriate type.
|
||||||
|
|
||||||
- Issue #21697: shutil.copytree() now correctly handles symbolic links that
|
- Issue #21697: shutil.copytree() now correctly handles symbolic links that
|
||||||
point to directories. Patch by Eduardo Seabra and Thomas Kluyver.
|
point to directories. Patch by Eduardo Seabra and Thomas Kluyver.
|
||||||
|
|
||||||
|
|
|
@ -1344,11 +1344,19 @@ encoder_init(PyObject *self, PyObject *args, PyObject *kwds)
|
||||||
assert(PyEncoder_Check(self));
|
assert(PyEncoder_Check(self));
|
||||||
s = (PyEncoderObject *)self;
|
s = (PyEncoderObject *)self;
|
||||||
|
|
||||||
if (!PyArg_ParseTupleAndKeywords(args, kwds, "OOOOOOOOp:make_encoder", kwlist,
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "OOOOUUOOp:make_encoder", kwlist,
|
||||||
&markers, &defaultfn, &encoder, &indent, &key_separator, &item_separator,
|
&markers, &defaultfn, &encoder, &indent,
|
||||||
|
&key_separator, &item_separator,
|
||||||
&sort_keys, &skipkeys, &allow_nan))
|
&sort_keys, &skipkeys, &allow_nan))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
if (markers != Py_None && !PyDict_Check(markers)) {
|
||||||
|
PyErr_Format(PyExc_TypeError,
|
||||||
|
"make_encoder() argument 1 must be dict or None, "
|
||||||
|
"not %.200s", Py_TYPE(markers)->tp_name);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
s->markers = markers;
|
s->markers = markers;
|
||||||
s->defaultfn = defaultfn;
|
s->defaultfn = defaultfn;
|
||||||
s->encoder = encoder;
|
s->encoder = encoder;
|
||||||
|
|
Loading…
Reference in New Issue