Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Kirill Smelkov
cpython
Commits
3cd1e42d
Commit
3cd1e42d
authored
16 years ago
by
Raymond Hettinger
Browse files
Options
Download
Email Patches
Plain Diff
Issue 3301: Bisect functions behaved badly when lo was negative.
parent
d2cd86dd
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
0 deletions
+27
-0
Lib/bisect.py
Lib/bisect.py
+8
-0
Lib/test/test_bisect.py
Lib/test/test_bisect.py
+8
-0
Misc/NEWS
Misc/NEWS
+3
-0
Modules/_bisectmodule.c
Modules/_bisectmodule.c
+8
-0
No files found.
Lib/bisect.py
View file @
3cd1e42d
...
...
@@ -9,6 +9,8 @@ def insort_right(a, x, lo=0, hi=None):
slice of a to be searched.
"""
if
lo
<
0
:
raise
ValueError
(
'lo must be non-negative'
)
if
hi
is
None
:
hi
=
len
(
a
)
while
lo
<
hi
:
...
...
@@ -30,6 +32,8 @@ def bisect_right(a, x, lo=0, hi=None):
slice of a to be searched.
"""
if
lo
<
0
:
raise
ValueError
(
'lo must be non-negative'
)
if
hi
is
None
:
hi
=
len
(
a
)
while
lo
<
hi
:
...
...
@@ -49,6 +53,8 @@ def insort_left(a, x, lo=0, hi=None):
slice of a to be searched.
"""
if
lo
<
0
:
raise
ValueError
(
'lo must be non-negative'
)
if
hi
is
None
:
hi
=
len
(
a
)
while
lo
<
hi
:
...
...
@@ -69,6 +75,8 @@ def bisect_left(a, x, lo=0, hi=None):
slice of a to be searched.
"""
if
lo
<
0
:
raise
ValueError
(
'lo must be non-negative'
)
if
hi
is
None
:
hi
=
len
(
a
)
while
lo
<
hi
:
...
...
This diff is collapsed.
Click to expand it.
Lib/test/test_bisect.py
View file @
3cd1e42d
...
...
@@ -114,6 +114,14 @@ class TestBisect(unittest.TestCase):
self
.
assertEqual
(
func
(
data
,
elem
),
expected
)
self
.
assertEqual
(
func
(
UserList
(
data
),
elem
),
expected
)
def
test_negative_lo
(
self
):
# Issue 3301
mod
=
self
.
module
self
.
assertRaises
(
ValueError
,
mod
.
bisect_left
,
[
1
,
2
,
3
],
5
,
-
1
,
3
),
self
.
assertRaises
(
ValueError
,
mod
.
bisect_right
,
[
1
,
2
,
3
],
5
,
-
1
,
3
),
self
.
assertRaises
(
ValueError
,
mod
.
insort_left
,
[
1
,
2
,
3
],
5
,
-
1
,
3
),
self
.
assertRaises
(
ValueError
,
mod
.
insort_right
,
[
1
,
2
,
3
],
5
,
-
1
,
3
),
def
test_random
(
self
,
n
=
25
):
from
random
import
randrange
for
i
in
xrange
(
n
):
...
...
This diff is collapsed.
Click to expand it.
Misc/NEWS
View file @
3cd1e42d
...
...
@@ -10,6 +10,7 @@ What's New in Python 2.6 beta 2?
Core and Builtins
-----------------
- Issue #2517: Allow unicode messages in Exceptions again by correctly
bypassing the instance dictionary when looking up __unicode__ on
new-style classes.
...
...
@@ -40,6 +41,8 @@ Core and Builtins
Library
-------
- Issue #3301: Bisect module modules behaved badly when lo was negative.
- Issue #839496: SimpleHTTPServer used to open text files in text mode. This is
both unnecessary (HTTP allows text content to be sent in several forms) and
wrong because the actual transmitted size could differ with the
...
...
This diff is collapsed.
Click to expand it.
Modules/_bisectmodule.c
View file @
3cd1e42d
...
...
@@ -11,6 +11,10 @@ internal_bisect_right(PyObject *list, PyObject *item, Py_ssize_t lo, Py_ssize_t
PyObject
*
litem
;
Py_ssize_t
mid
,
res
;
if
(
lo
<
0
)
{
PyErr_SetString
(
PyExc_ValueError
,
"lo must be non-negative"
);
return
-
1
;
}
if
(
hi
==
-
1
)
{
hi
=
PySequence_Size
(
list
);
if
(
hi
<
0
)
...
...
@@ -108,6 +112,10 @@ internal_bisect_left(PyObject *list, PyObject *item, int lo, int hi)
PyObject
*
litem
;
int
mid
,
res
;
if
(
lo
<
0
)
{
PyErr_SetString
(
PyExc_ValueError
,
"lo must be non-negative"
);
return
-
1
;
}
if
(
hi
==
-
1
)
{
hi
=
PySequence_Size
(
list
);
if
(
hi
<
0
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment