Mailman 3 November 2013 - Python-checkins

cpython (3.3): Issue #19638: Raise ValueError instead of crashing when converting billion
by mark.dickinson Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/eac133e13bb5 changeset: 87582:eac133e13bb5 branch: 3.3 parent: 87580:c1d163203f21 user: Mark Dickinson <dickinsm(a)gmail.com> date: Tue Nov 26 16:19:13 2013 +0000 summary: Issue #19638: Raise ValueError instead of crashing when converting billion character strings to float. files: Lib/test/test_strtod.py | 31 ++++++++++++++++ Misc/NEWS | 3 + Python/dtoa.c | 55 ++++++++++++++++++++++------ 3 files changed, 77 insertions(+), 12 deletions(-) diff --git a/Lib/test/test_strtod.py b/Lib/test/test_strtod.py --- a/Lib/test/test_strtod.py +++ b/Lib/test/test_strtod.py @@ -248,6 +248,37 @@ else: assert False, "expected ValueError" + @test.support.bigmemtest(size=5 * test.support._1G, memuse=1, dry_run=False) + def test_oversized_digit_strings(self, maxsize): + # Input string whose length doesn't fit in an INT. + s = "1." + "1" * int(2.2e9) + with self.assertRaises(ValueError): + float(s) + del s + + s = "0." + "0" * int(2.2e9) + "1" + with self.assertRaises(ValueError): + float(s) + del s + + def test_large_exponents(self): + # Verify that the clipping of the exponent in strtod doesn't affect the + # output values. + def positive_exp(n): + """ Long string with value 1.0 and exponent n""" + return '0.{}1e+{}'.format('0'*(n-1), n) + + def negative_exp(n): + """ Long string with value 1.0 and exponent -n""" + return '1{}e-{}'.format('0'*n, n) + + self.assertEqual(float(positive_exp(10000)), 1.0) + self.assertEqual(float(positive_exp(20000)), 1.0) + self.assertEqual(float(positive_exp(30000)), 1.0) + self.assertEqual(float(negative_exp(10000)), 1.0) + self.assertEqual(float(negative_exp(20000)), 1.0) + self.assertEqual(float(negative_exp(30000)), 1.0) + def test_particular(self): # inputs that produced crashes or incorrectly rounded results with # previous versions of dtoa.c, for various reasons diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #19638: Fix possible crash / undefined behaviour from huge (more than 2 + billion characters) input strings in _Py_dg_strtod. + Library ------- diff --git a/Python/dtoa.c b/Python/dtoa.c --- a/Python/dtoa.c +++ b/Python/dtoa.c @@ -204,7 +204,24 @@ MAX_ABS_EXP in absolute value get truncated to +-MAX_ABS_EXP. MAX_ABS_EXP should fit into an int. */ #ifndef MAX_ABS_EXP -#define MAX_ABS_EXP 19999U +#define MAX_ABS_EXP 1100000000U +#endif +/* Bound on length of pieces of input strings in _Py_dg_strtod; specifically, + this is used to bound the total number of digits ignoring leading zeros and + the number of digits that follow the decimal point. Ideally, MAX_DIGITS + should satisfy MAX_DIGITS + 400 < MAX_ABS_EXP; that ensures that the + exponent clipping in _Py_dg_strtod can't affect the value of the output. */ +#ifndef MAX_DIGITS +#define MAX_DIGITS 1000000000U +#endif + +/* Guard against trying to use the above values on unusual platforms with ints + * of width less than 32 bits. */ +#if MAX_ABS_EXP > INT_MAX +#error "MAX_ABS_EXP should fit in an int" +#endif +#if MAX_DIGITS > INT_MAX +#error "MAX_DIGITS should fit in an int" #endif /* The following definition of Storeinc is appropriate for MIPS processors. @@ -1538,6 +1555,7 @@ Long L; BCinfo bc; Bigint *bb, *bb1, *bd, *bd0, *bs, *delta; + size_t ndigits, fraclen; dval(&rv) = 0.; @@ -1560,40 +1578,53 @@ c = *++s; lz = s != s1; - /* Point s0 at the first nonzero digit (if any). nd0 will be the position - of the point relative to s0. nd will be the total number of digits - ignoring leading zeros. */ + /* Point s0 at the first nonzero digit (if any). fraclen will be the + number of digits between the decimal point and the end of the + digit string. ndigits will be the total number of digits ignoring + leading zeros. */ s0 = s1 = s; while ('0' <= c && c <= '9') c = *++s; - nd0 = nd = s - s1; + ndigits = s - s1; + fraclen = 0; /* Parse decimal point and following digits. */ if (c == '.') { c = *++s; - if (!nd) { + if (!ndigits) { s1 = s; while (c == '0') c = *++s; lz = lz || s != s1; - nd0 -= s - s1; + fraclen += (s - s1); s0 = s; } s1 = s; while ('0' <= c && c <= '9') c = *++s; - nd += s - s1; + ndigits += s - s1; + fraclen += s - s1; } - /* Now lz is true if and only if there were leading zero digits, and nd - gives the total number of digits ignoring leading zeros. A valid input - must have at least one digit. */ - if (!nd && !lz) { + /* Now lz is true if and only if there were leading zero digits, and + ndigits gives the total number of digits ignoring leading zeros. A + valid input must have at least one digit. */ + if (!ndigits && !lz) { if (se) *se = (char *)s00; goto parse_error; } + /* Range check ndigits and fraclen to make sure that they, and values + computed with them, can safely fit in an int. */ + if (ndigits > MAX_DIGITS || fraclen > MAX_DIGITS) { + if (se) + *se = (char *)s00; + goto parse_error; + } + nd = (int)ndigits; + nd0 = (int)ndigits - (int)fraclen; + /* Parse exponent. */ e = 0; if (c == 'e' || c == 'E') { -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #19794: Improved markup for True/False constants.
by serhiy.storchaka Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/67e642f5ab5d changeset: 87581:67e642f5ab5d parent: 87578:25f856d500e3 parent: 87580:c1d163203f21 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Tue Nov 26 17:33:13 2013 +0200 summary: Issue #19794: Improved markup for True/False constants. files: Doc/library/decimal.rst | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst --- a/Doc/library/decimal.rst +++ b/Doc/library/decimal.rst @@ -1183,52 +1183,52 @@ .. method:: is_canonical(x) - Returns True if *x* is canonical; otherwise returns False. + Returns ``True`` if *x* is canonical; otherwise returns ``False``. .. method:: is_finite(x) - Returns True if *x* is finite; otherwise returns False. + Returns ``True`` if *x* is finite; otherwise returns ``False``. .. method:: is_infinite(x) - Returns True if *x* is infinite; otherwise returns False. + Returns ``True`` if *x* is infinite; otherwise returns ``False``. .. method:: is_nan(x) - Returns True if *x* is a qNaN or sNaN; otherwise returns False. + Returns ``True`` if *x* is a qNaN or sNaN; otherwise returns ``False``. .. method:: is_normal(x) - Returns True if *x* is a normal number; otherwise returns False. + Returns ``True`` if *x* is a normal number; otherwise returns ``False``. .. method:: is_qnan(x) - Returns True if *x* is a quiet NaN; otherwise returns False. + Returns ``True`` if *x* is a quiet NaN; otherwise returns ``False``. .. method:: is_signed(x) - Returns True if *x* is negative; otherwise returns False. + Returns ``True`` if *x* is negative; otherwise returns ``False``. .. method:: is_snan(x) - Returns True if *x* is a signaling NaN; otherwise returns False. + Returns ``True`` if *x* is a signaling NaN; otherwise returns ``False``. .. method:: is_subnormal(x) - Returns True if *x* is subnormal; otherwise returns False. + Returns ``True`` if *x* is subnormal; otherwise returns ``False``. .. method:: is_zero(x) - Returns True if *x* is a zero; otherwise returns False. + Returns ``True`` if *x* is a zero; otherwise returns ``False``. .. method:: ln(x) @@ -1390,7 +1390,7 @@ .. method:: same_quantum(x, y) - Returns True if the two operands have the same exponent. + Returns ``True`` if the two operands have the same exponent. .. method:: scaleb (x, y) @@ -1452,9 +1452,9 @@ .. data:: HAVE_THREADS - The default value is True. If Python is compiled without threads, the + The default value is ``True``. If Python is compiled without threads, the C version automatically disables the expensive thread local context - machinery. In this case, the value is False. + machinery. In this case, the value is ``False``. Rounding modes -------------- -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #19794: Improved markup for True/False constants.
by serhiy.storchaka Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/c1d163203f21 changeset: 87580:c1d163203f21 branch: 3.3 parent: 87574:a5e590151034 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Tue Nov 26 17:32:16 2013 +0200 summary: Issue #19794: Improved markup for True/False constants. files: Doc/library/decimal.rst | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst --- a/Doc/library/decimal.rst +++ b/Doc/library/decimal.rst @@ -1183,52 +1183,52 @@ .. method:: is_canonical(x) - Returns True if *x* is canonical; otherwise returns False. + Returns ``True`` if *x* is canonical; otherwise returns ``False``. .. method:: is_finite(x) - Returns True if *x* is finite; otherwise returns False. + Returns ``True`` if *x* is finite; otherwise returns ``False``. .. method:: is_infinite(x) - Returns True if *x* is infinite; otherwise returns False. + Returns ``True`` if *x* is infinite; otherwise returns ``False``. .. method:: is_nan(x) - Returns True if *x* is a qNaN or sNaN; otherwise returns False. + Returns ``True`` if *x* is a qNaN or sNaN; otherwise returns ``False``. .. method:: is_normal(x) - Returns True if *x* is a normal number; otherwise returns False. + Returns ``True`` if *x* is a normal number; otherwise returns ``False``. .. method:: is_qnan(x) - Returns True if *x* is a quiet NaN; otherwise returns False. + Returns ``True`` if *x* is a quiet NaN; otherwise returns ``False``. .. method:: is_signed(x) - Returns True if *x* is negative; otherwise returns False. + Returns ``True`` if *x* is negative; otherwise returns ``False``. .. method:: is_snan(x) - Returns True if *x* is a signaling NaN; otherwise returns False. + Returns ``True`` if *x* is a signaling NaN; otherwise returns ``False``. .. method:: is_subnormal(x) - Returns True if *x* is subnormal; otherwise returns False. + Returns ``True`` if *x* is subnormal; otherwise returns ``False``. .. method:: is_zero(x) - Returns True if *x* is a zero; otherwise returns False. + Returns ``True`` if *x* is a zero; otherwise returns ``False``. .. method:: ln(x) @@ -1390,7 +1390,7 @@ .. method:: same_quantum(x, y) - Returns True if the two operands have the same exponent. + Returns ``True`` if the two operands have the same exponent. .. method:: scaleb (x, y) @@ -1452,9 +1452,9 @@ .. data:: HAVE_THREADS - The default value is True. If Python is compiled without threads, the + The default value is ``True``. If Python is compiled without threads, the C version automatically disables the expensive thread local context - machinery. In this case, the value is False. + machinery. In this case, the value is ``False``. Rounding modes -------------- -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #19794: Improved markup for True/False constants.
by serhiy.storchaka Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/04c4f141874b changeset: 87579:04c4f141874b branch: 2.7 parent: 87556:313d9bb253bf user: Serhiy Storchaka <storchaka(a)gmail.com> date: Tue Nov 26 17:32:03 2013 +0200 summary: Issue #19794: Improved markup for True/False constants. files: Doc/library/decimal.rst | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst --- a/Doc/library/decimal.rst +++ b/Doc/library/decimal.rst @@ -1226,52 +1226,52 @@ .. method:: is_canonical(x) - Returns True if *x* is canonical; otherwise returns False. + Returns ``True`` if *x* is canonical; otherwise returns ``False``. .. method:: is_finite(x) - Returns True if *x* is finite; otherwise returns False. + Returns ``True`` if *x* is finite; otherwise returns ``False``. .. method:: is_infinite(x) - Returns True if *x* is infinite; otherwise returns False. + Returns ``True`` if *x* is infinite; otherwise returns ``False``. .. method:: is_nan(x) - Returns True if *x* is a qNaN or sNaN; otherwise returns False. + Returns ``True`` if *x* is a qNaN or sNaN; otherwise returns ``False``. .. method:: is_normal(x) - Returns True if *x* is a normal number; otherwise returns False. + Returns ``True`` if *x* is a normal number; otherwise returns ``False``. .. method:: is_qnan(x) - Returns True if *x* is a quiet NaN; otherwise returns False. + Returns ``True`` if *x* is a quiet NaN; otherwise returns ``False``. .. method:: is_signed(x) - Returns True if *x* is negative; otherwise returns False. + Returns ``True`` if *x* is negative; otherwise returns ``False``. .. method:: is_snan(x) - Returns True if *x* is a signaling NaN; otherwise returns False. + Returns ``True`` if *x* is a signaling NaN; otherwise returns ``False``. .. method:: is_subnormal(x) - Returns True if *x* is subnormal; otherwise returns False. + Returns ``True`` if *x* is subnormal; otherwise returns ``False``. .. method:: is_zero(x) - Returns True if *x* is a zero; otherwise returns False. + Returns ``True`` if *x* is a zero; otherwise returns ``False``. .. method:: ln(x) @@ -1431,7 +1431,7 @@ .. method:: same_quantum(x, y) - Returns True if the two operands have the same exponent. + Returns ``True`` if the two operands have the same exponent. .. method:: scaleb (x, y) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #19760: Silence sysconfig's 'SO' key deprecation warnings in tests.
by serhiy.storchaka Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/25f856d500e3 changeset: 87578:25f856d500e3 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Tue Nov 26 17:08:24 2013 +0200 summary: Issue #19760: Silence sysconfig's 'SO' key deprecation warnings in tests. Change stacklevel in warnings.warn() for 'SO' key to 2. files: Lib/distutils/sysconfig.py | 2 +- Lib/distutils/tests/test_sysconfig.py | 7 ++++--- Lib/sysconfig.py | 2 +- Lib/test/test_sysconfig.py | 7 ++++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -575,5 +575,5 @@ """ if name == 'SO': import warnings - warnings.warn('SO is deprecated, use EXT_SUFFIX', DeprecationWarning) + warnings.warn('SO is deprecated, use EXT_SUFFIX', DeprecationWarning, 2) return get_config_vars().get(name) diff --git a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py --- a/Lib/distutils/tests/test_sysconfig.py +++ b/Lib/distutils/tests/test_sysconfig.py @@ -6,7 +6,7 @@ from distutils import sysconfig from distutils.ccompiler import get_default_compiler from distutils.tests import support -from test.support import TESTFN, run_unittest +from test.support import TESTFN, run_unittest, check_warnings class SysconfigTestCase(support.EnvironGuard, unittest.TestCase): def setUp(self): @@ -166,8 +166,9 @@ @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None, 'EXT_SUFFIX required for this test') def test_SO_value(self): - self.assertEqual(sysconfig.get_config_var('SO'), - sysconfig.get_config_var('EXT_SUFFIX')) + with check_warnings(('', DeprecationWarning)): + self.assertEqual(sysconfig.get_config_var('SO'), + sysconfig.get_config_var('EXT_SUFFIX')) @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None, 'EXT_SUFFIX required for this test') diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -585,7 +585,7 @@ """ if name == 'SO': import warnings - warnings.warn('SO is deprecated, use EXT_SUFFIX', DeprecationWarning) + warnings.warn('SO is deprecated, use EXT_SUFFIX', DeprecationWarning, 2) return get_config_vars().get(name) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -5,7 +5,7 @@ import shutil from copy import copy -from test.support import (run_unittest, TESTFN, unlink, +from test.support import (run_unittest, TESTFN, unlink, check_warnings, captured_stdout, skip_unless_symlink) import sysconfig @@ -378,8 +378,9 @@ @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None, 'EXT_SUFFIX required for this test') def test_SO_value(self): - self.assertEqual(sysconfig.get_config_var('SO'), - sysconfig.get_config_var('EXT_SUFFIX')) + with check_warnings(('', DeprecationWarning)): + self.assertEqual(sysconfig.get_config_var('SO'), + sysconfig.get_config_var('EXT_SUFFIX')) @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None, 'EXT_SUFFIX required for this test') -- Repository URL: http://hg.python.org/cpython

1 0

cpython: tracemalloc: fix get_traced_memory() docstring for result type
by victor.stinner Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/1fed50c8ea62 changeset: 87577:1fed50c8ea62 user: Victor Stinner <victor.stinner(a)gmail.com> date: Tue Nov 26 10:46:06 2013 +0100 summary: tracemalloc: fix get_traced_memory() docstring for result type files: Modules/_tracemalloc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c --- a/Modules/_tracemalloc.c +++ b/Modules/_tracemalloc.c @@ -1264,7 +1264,7 @@ } PyDoc_STRVAR(tracemalloc_get_traced_memory_doc, - "get_traced_memory() -> int\n" + "get_traced_memory() -> (int, int)\n" "\n" "Get the current size and maximum size of memory blocks traced\n" "by the tracemalloc module as a tuple: (size: int, max_size: int)."); -- Repository URL: http://hg.python.org/cpython

1 0

cpython: tracemalloc: Fix hash methods of Statistic and StatisticDiff
by victor.stinner Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/9eae3a8181bc changeset: 87576:9eae3a8181bc user: Victor Stinner <victor.stinner(a)gmail.com> date: Tue Nov 26 10:16:25 2013 +0100 summary: tracemalloc: Fix hash methods of Statistic and StatisticDiff files: Lib/tracemalloc.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Lib/tracemalloc.py b/Lib/tracemalloc.py --- a/Lib/tracemalloc.py +++ b/Lib/tracemalloc.py @@ -39,7 +39,7 @@ self.count = count def __hash__(self): - return (self.traceback, self.size, self.count) + return hash((self.traceback, self.size, self.count)) def __eq__(self, other): return (self.traceback == other.traceback @@ -79,8 +79,8 @@ self.count_diff = count_diff def __hash__(self): - return (self.traceback, self.size, self.size_diff, - self.count, self.count_diff) + return hash((self.traceback, self.size, self.size_diff, + self.count, self.count_diff)) def __eq__(self, other): return (self.traceback == other.traceback @@ -104,7 +104,6 @@ def __repr__(self): return ('<StatisticDiff traceback=%r size=%i (%+i) count=%i (%+i)>' % (self.traceback, self.size, self.size_diff, - self.count, self.count_diff)) def _sort_key(self): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): merge with 3.3
by georg.brandl Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/1640b3bdd5b6 changeset: 87575:1640b3bdd5b6 parent: 87573:976e41a50022 parent: 87574:a5e590151034 user: Georg Brandl <georg(a)python.org> date: Tue Nov 26 08:25:45 2013 +0100 summary: merge with 3.3 files: Doc/library/subprocess.rst | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -452,7 +452,6 @@ the system default of io.DEFAULT_BUFFER_SIZE will be used. .. versionchanged:: 3.3.1 - *bufsize* now defaults to -1 to enable buffering by default to match the behavior that most code expects. In versions prior to Python 3.2.4 and 3.3.1 it incorrectly defaulted to :const:`0` which was unbuffered -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Markup fix.
by georg.brandl Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/a5e590151034 changeset: 87574:a5e590151034 branch: 3.3 parent: 87557:6aeaaa614a19 user: Georg Brandl <georg(a)python.org> date: Tue Nov 26 08:25:24 2013 +0100 summary: Markup fix. files: Doc/library/subprocess.rst | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -442,7 +442,6 @@ the system default of io.DEFAULT_BUFFER_SIZE will be used. .. versionchanged:: 3.3.1 - *bufsize* now defaults to -1 to enable buffering by default to match the behavior that most code expects. In versions prior to Python 3.2.4 and 3.3.1 it incorrectly defaulted to :const:`0` which was unbuffered -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Fix test_fcntl to run properly on systems that do not support the flags
by gregory.p.smith Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/cac7319c5972 changeset: 87537:cac7319c5972 branch: 2.7 parent: 87534:3981e57a7bdc user: Gregory P. Smith <greg(a)krypto.org> date: Mon Nov 25 04:45:27 2013 +0000 summary: Fix test_fcntl to run properly on systems that do not support the flags used in the "does the value get passed in properly" test. files: Lib/test/test_fcntl.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py --- a/Lib/test/test_fcntl.py +++ b/Lib/test/test_fcntl.py @@ -113,7 +113,10 @@ self.skipTest("F_NOTIFY or DN_MULTISHOT unavailable") fd = os.open(os.path.dirname(os.path.abspath(TESTFN)), os.O_RDONLY) try: + # This will raise OverflowError if issue1309352 is present. fcntl.fcntl(fd, cmd, flags) + except IOError: + pass # Running on a system that doesn't support these flags. finally: os.close(fd) -- Repository URL: http://hg.python.org/cpython

3 2