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
2ffa8f2b
Commit
2ffa8f2b
authored
Dec 12, 2012
by
Tres Seaver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make the no-default-comparison check work on Py3k.
parent
e0058b60
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
8 deletions
+11
-8
BTrees/_base.py
BTrees/_base.py
+11
-8
No files found.
BTrees/_base.py
View file @
2ffa8f2b
...
@@ -203,6 +203,15 @@ class _SetIteration(object):
...
@@ -203,6 +203,15 @@ class _SetIteration(object):
return
self
return
self
def
_no_default_comparison
(
key
):
# Enforce test that key has non-default comparison.
lt
=
getattr
(
key
,
'__lt__'
,
None
)
if
lt
is
not
None
:
if
getattr
(
lt
,
'__objclass__'
,
None
)
is
object
:
#pragma NO COVER Py3k
lt
=
None
if
(
lt
is
None
and
getattr
(
key
,
'__cmp__'
,
None
)
is
None
):
raise
TypeError
(
"Can't use default __cmp__"
)
class
Bucket
(
_BucketBase
):
class
Bucket
(
_BucketBase
):
...
@@ -240,10 +249,7 @@ class Bucket(_BucketBase):
...
@@ -240,10 +249,7 @@ class Bucket(_BucketBase):
raise
TypeError
(
'items must be a sequence of 2-tuples'
)
raise
TypeError
(
'items must be a sequence of 2-tuples'
)
def
__setitem__
(
self
,
key
,
value
):
def
__setitem__
(
self
,
key
,
value
):
# Enforce test that key has non-default comparison.
_no_default_comparison
(
key
)
if
(
getattr
(
key
,
'__lt__'
,
None
)
is
None
and
getattr
(
key
,
'__cmp__'
,
None
)
is
None
):
raise
TypeError
(
"Can't use default __cmp__"
)
self
.
_set
(
self
.
_to_key
(
key
),
self
.
_to_value
(
value
))
self
.
_set
(
self
.
_to_key
(
key
),
self
.
_to_value
(
value
))
def
__delitem__
(
self
,
key
):
def
__delitem__
(
self
,
key
):
...
@@ -730,10 +736,7 @@ class _Tree(_Base):
...
@@ -730,10 +736,7 @@ class _Tree(_Base):
set
(
*
i
)
set
(
*
i
)
def
__setitem__
(
self
,
key
,
value
):
def
__setitem__
(
self
,
key
,
value
):
# Enforce test that key has non-default comparison.
_no_default_comparison
(
key
)
if
(
getattr
(
key
,
'__lt__'
,
None
)
is
None
and
getattr
(
key
,
'__cmp__'
,
None
)
is
None
):
raise
TypeError
(
"Can't use default __cmp__"
)
self
.
_set
(
self
.
_to_key
(
key
),
self
.
_to_value
(
value
))
self
.
_set
(
self
.
_to_key
(
key
),
self
.
_to_value
(
value
))
def
__delitem__
(
self
,
key
):
def
__delitem__
(
self
,
key
):
...
...
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