Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
BTrees
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
BTrees
Commits
ac133de1
Commit
ac133de1
authored
Nov 14, 2012
by
Tres Seaver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Coverage.
parent
26a7f9a6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
141 additions
and
26 deletions
+141
-26
BTrees/_base.py
BTrees/_base.py
+10
-6
BTrees/tests/test__base.py
BTrees/tests/test__base.py
+131
-20
No files found.
BTrees/_base.py
View file @
ac133de1
...
@@ -187,19 +187,23 @@ class _SetIteration(object):
...
@@ -187,19 +187,23 @@ class _SetIteration(object):
class
Bucket
(
_BucketBase
):
class
Bucket
(
_BucketBase
):
_value_type
=
list
_value_type
=
list
_to_value
=
lambda
x
:
x
_to_value
=
lambda
self
,
x
:
x
VALUE_SAME_CHECK
=
False
VALUE_SAME_CHECK
=
False
def
setdefault
(
self
,
key
,
value
):
def
setdefault
(
self
,
key
,
value
):
return
self
.
_set
(
self
.
_to_key
(
key
),
self
.
_to_value
(
value
),
True
)[
1
]
key
,
value
=
self
.
_to_key
(
key
),
self
.
_to_value
(
value
)
status
,
value
=
self
.
_set
(
key
,
value
,
True
)
return
value
def
pop
(
self
,
key
,
default
=
_marker
):
def
pop
(
self
,
key
,
default
=
_marker
):
try
:
try
:
return
self
.
_del
(
self
.
_to_key
(
key
))[
1
]
status
,
value
=
self
.
_del
(
self
.
_to_key
(
key
))
except
KeyError
:
except
KeyError
:
if
default
is
_marker
:
if
default
is
_marker
:
raise
raise
return
default
return
default
else
:
return
value
def
update
(
self
,
items
):
def
update
(
self
,
items
):
if
hasattr
(
items
,
'iteritems'
):
if
hasattr
(
items
,
'iteritems'
):
...
@@ -207,9 +211,9 @@ class Bucket(_BucketBase):
...
@@ -207,9 +211,9 @@ class Bucket(_BucketBase):
elif
hasattr
(
items
,
'items'
):
elif
hasattr
(
items
,
'items'
):
items
=
items
.
items
()
items
=
items
.
items
()
set
=
self
.
__setitem__
_si
=
self
.
__setitem__
for
i
in
items
:
for
key
,
value
in
items
:
set
(
*
i
)
_si
(
key
,
value
)
def
__setitem__
(
self
,
key
,
value
):
def
__setitem__
(
self
,
key
,
value
):
# Enforce test that key has non-default comparison.
# Enforce test that key has non-default comparison.
...
...
BTrees/tests/test__base.py
View file @
ac133de1
...
@@ -423,27 +423,138 @@ class BucketTests(unittest.TestCase):
...
@@ -423,27 +423,138 @@ class BucketTests(unittest.TestCase):
return
Bucket
return
Bucket
def
_makeOne
(
self
):
def
_makeOne
(
self
):
class
_TestMapping
(
self
.
_getTargetClass
()):
return
self
.
_getTargetClass
()()
_values
=
None
def
__setstate__
(
self
,
state
):
def
test_ctor_defaults
(
self
):
state
,
self
.
_next
=
state
bucket
=
self
.
_makeOne
()
self
.
_keys
=
[]
bucket
.
_to_key
=
lambda
x
:
x
self
.
_values
=
[]
self
.
assertEqual
(
bucket
.
_keys
,
[])
for
i
in
range
(
len
(
state
)
//
2
):
self
.
assertEqual
(
bucket
.
_values
,
[])
self
.
_keys
.
append
(
state
[
i
])
self
.
_values
.
append
(
state
[
i
+
1
])
def
test_setdefault_miss
(
self
):
def
clear
(
self
):
bucket
=
self
.
_makeOne
()
self
.
_keys
,
self
.
_values
,
self
.
_next
=
[],
[],
None
bucket
.
_to_key
=
lambda
x
:
x
def
iteritems
(
self
):
self
.
assertEqual
(
bucket
.
setdefault
(
'a'
,
'b'
),
'b'
)
return
iter
(
zip
(
self
.
_keys
,
self
.
_values
))
self
.
assertEqual
(
bucket
.
_keys
,
[
'a'
])
return
_TestMapping
()
self
.
assertEqual
(
bucket
.
_values
,
[
'b'
])
def
test_setdefault_hit
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
bucket
.
_keys
.
append
(
'a'
)
bucket
.
_values
.
append
(
'b'
)
self
.
assertEqual
(
bucket
.
setdefault
(
'a'
,
'b'
),
'b'
)
self
.
assertEqual
(
bucket
.
_keys
,
[
'a'
])
self
.
assertEqual
(
bucket
.
_values
,
[
'b'
])
def
test_pop_miss_no_default
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
self
.
assertRaises
(
KeyError
,
bucket
.
pop
,
'nonesuch'
)
def
test_pop_miss_w_default
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
self
.
assertEqual
(
bucket
.
pop
(
'nonesuch'
,
'b'
),
'b'
)
def
test_pop_hit
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
bucket
.
_keys
.
append
(
'a'
)
bucket
.
_values
.
append
(
'b'
)
self
.
assertEqual
(
bucket
.
pop
(
'a'
),
'b'
)
self
.
assertEqual
(
bucket
.
_keys
,
[])
self
.
assertEqual
(
bucket
.
_values
,
[])
def
test_update_value_w_iteritems
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
bucket
.
update
({
'a'
:
'b'
})
self
.
assertEqual
(
bucket
.
_keys
,
[
'a'
])
self
.
assertEqual
(
bucket
.
_values
,
[
'b'
])
def
test_update_value_w_items
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
class
Foo
(
object
):
def
items
(
self
):
return
[(
'a'
,
'b'
)]
bucket
.
update
(
Foo
())
self
.
assertEqual
(
bucket
.
_keys
,
[
'a'
])
self
.
assertEqual
(
bucket
.
_values
,
[
'b'
])
def
test_update_sequence
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
bucket
.
update
([(
'a'
,
'b'
)])
self
.
assertEqual
(
bucket
.
_keys
,
[
'a'
])
self
.
assertEqual
(
bucket
.
_values
,
[
'b'
])
def
test___setitem___incomparable
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
def
_should_error
():
bucket
[
object
()]
=
'b'
self
.
assertRaises
(
TypeError
,
_should_error
)
def
test___setitem___comparable
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
bucket
[
'a'
]
=
'b'
def
test___delitem___miss
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
def
_should_error
():
del
bucket
[
'nonesuch'
]
self
.
assertRaises
(
KeyError
,
_should_error
)
def
test___delitem___hit
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
bucket
.
_keys
.
append
(
'a'
)
bucket
.
_values
.
append
(
'b'
)
del
bucket
[
'a'
]
self
.
assertEqual
(
bucket
.
_keys
,
[])
self
.
assertEqual
(
bucket
.
_values
,
[])
def
test_get_miss_no_default
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
self
.
assertEqual
(
bucket
.
get
(
'nonesuch'
),
None
)
def
test_get_miss_w_default
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
self
.
assertEqual
(
bucket
.
get
(
'nonesuch'
,
'b'
),
'b'
)
def
test_get_hit
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
bucket
.
_keys
.
append
(
'a'
)
bucket
.
_values
.
append
(
'b'
)
self
.
assertEqual
(
bucket
.
get
(
'a'
),
'b'
)
def
test___getitem___miss
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
def
_should_error
():
return
bucket
[
'nonesuch'
]
self
.
assertRaises
(
KeyError
,
_should_error
)
def
test___getitem___hit
(
self
):
bucket
=
self
.
_makeOne
()
bucket
.
_to_key
=
lambda
x
:
x
bucket
.
_keys
.
append
(
'a'
)
bucket
.
_values
.
append
(
'b'
)
self
.
assertEqual
(
bucket
[
'a'
],
'b'
)
def
test__p_resolveConflict_delete_first_new
(
self
):
def
test__p_resolveConflict_delete_first_new
(
self
):
from
..Interfaces
import
BTreesConflictError
from
..Interfaces
import
BTreesConflictError
_mapping
=
self
.
_makeOne
()
_mapping
=
self
.
_makeOne
()
s_old
=
(
[
'a'
,
0
,
'b'
,
1
]
,
None
)
s_old
=
(
(
'a'
,
0
,
'b'
,
1
)
,
None
)
s_com
=
(
[
'a'
,
1
,
'b'
,
2
,
'c'
,
3
]
,
None
)
s_com
=
(
(
'a'
,
1
,
'b'
,
2
,
'c'
,
3
)
,
None
)
s_new
=
(
[
'b'
,
4
]
,
None
)
s_new
=
(
(
'b'
,
4
)
,
None
)
e
=
self
.
assertRaises
(
BTreesConflictError
,
e
=
self
.
assertRaises
(
BTreesConflictError
,
_mapping
.
_p_resolveConflict
,
s_old
,
s_com
,
s_new
)
_mapping
.
_p_resolveConflict
,
s_old
,
s_com
,
s_new
)
self
.
assertEqual
(
e
.
reason
,
2
)
self
.
assertEqual
(
e
.
reason
,
2
)
...
@@ -451,9 +562,9 @@ class BucketTests(unittest.TestCase):
...
@@ -451,9 +562,9 @@ class BucketTests(unittest.TestCase):
def
test__p_resolveConflict_delete_first_committed
(
self
):
def
test__p_resolveConflict_delete_first_committed
(
self
):
from
..Interfaces
import
BTreesConflictError
from
..Interfaces
import
BTreesConflictError
_mapping
=
self
.
_makeOne
()
_mapping
=
self
.
_makeOne
()
s_old
=
(
[
'a'
,
0
,
'b'
,
1
]
,
None
)
s_old
=
(
(
'a'
,
0
,
'b'
,
1
)
,
None
)
s_com
=
(
[
'b'
,
4
]
,
None
)
s_com
=
(
(
'b'
,
4
)
,
None
)
s_new
=
(
[
'a'
,
1
,
'b'
,
2
,
'c'
,
3
]
,
None
)
s_new
=
(
(
'a'
,
1
,
'b'
,
2
,
'c'
,
3
)
,
None
)
e
=
self
.
assertRaises
(
BTreesConflictError
,
e
=
self
.
assertRaises
(
BTreesConflictError
,
_mapping
.
_p_resolveConflict
,
s_old
,
s_com
,
s_new
)
_mapping
.
_p_resolveConflict
,
s_old
,
s_com
,
s_new
)
self
.
assertEqual
(
e
.
reason
,
3
)
self
.
assertEqual
(
e
.
reason
,
3
)
...
...
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