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
953bc318
Commit
953bc318
authored
Nov 12, 2012
by
Tres Seaver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PEP8; remove 'else:' after return.
parent
3ecf5ce9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
79 deletions
+28
-79
BTrees/___BTree.py
BTrees/___BTree.py
+28
-79
No files found.
BTrees/___BTree.py
View file @
953bc318
...
...
@@ -56,11 +56,11 @@ class _BucketBase(_Base):
def
_search
(
self
,
key
):
# Return non-negative index on success
# return -(insertion_index+1) on fail
low
=
0
low
=
0
keys
=
self
.
_keys
high
=
len
(
keys
)
high
=
len
(
keys
)
while
low
<
high
:
i
=
(
low
+
high
)
//
2
i
=
(
low
+
high
)
//
2
k
=
keys
[
i
]
if
k
==
key
:
return
i
...
...
@@ -68,19 +68,17 @@ class _BucketBase(_Base):
low
=
i
+
1
else
:
high
=
i
return
-
1
-
low
return
-
1
-
low
def
minKey
(
self
,
key
=
_marker
):
if
key
is
_marker
:
return
self
.
_keys
[
0
]
else
:
key
=
self
.
_to_key
(
key
)
index
=
self
.
_search
(
key
)
if
index
>-
0
:
return
key
else
:
index
=
-
index
-
1
index
=
-
index
-
1
if
index
<
len
(
self
.
_keys
):
return
self
.
_keys
[
index
]
else
:
...
...
@@ -89,7 +87,6 @@ class _BucketBase(_Base):
def
maxKey
(
self
,
key
=
_marker
):
if
key
is
_marker
:
return
self
.
_keys
[
-
1
]
else
:
key
=
self
.
_to_key
(
key
)
index
=
self
.
_search
(
key
)
if
index
>=
0
:
...
...
@@ -418,7 +415,7 @@ class Bucket(_MappingBase, _BucketBase):
return
0
,
value
else
:
self
.
_p_changed
=
True
index
=
-
index
-
1
index
=
-
index
-
1
self
.
_keys
.
insert
(
index
,
key
)
self
.
_values
.
insert
(
index
,
value
)
return
1
,
value
...
...
@@ -429,7 +426,6 @@ class Bucket(_MappingBase, _BucketBase):
self
.
_p_changed
=
True
del
self
.
_keys
[
index
]
return
0
,
self
.
_values
.
pop
(
index
)
else
:
raise
KeyError
(
key
)
def
_split
(
self
,
index
=-
1
):
...
...
@@ -473,7 +469,6 @@ class Bucket(_MappingBase, _BucketBase):
if
self
.
_next
:
return
data
,
self
.
_next
else
:
return
(
data
,
)
def
__setstate__
(
self
,
state
):
...
...
@@ -500,7 +495,6 @@ class Set(_SetBase, _BucketBase):
data
=
tuple
(
self
.
_keys
)
if
self
.
_next
:
return
data
,
self
.
_next
else
:
return
(
data
,
)
def
__setstate__
(
self
,
state
):
...
...
@@ -520,10 +514,9 @@ class Set(_SetBase, _BucketBase):
def
_set
(
self
,
key
,
value
=
None
,
ifunset
=
False
):
index
=
self
.
_search
(
key
)
if
index
<
0
:
index
=
-
index
-
1
index
=
-
index
-
1
self
.
_keys
.
insert
(
index
,
key
)
return
True
,
None
else
:
return
False
,
None
def
_del
(
self
,
key
):
...
...
@@ -532,7 +525,6 @@ class Set(_SetBase, _BucketBase):
self
.
_p_changed
=
True
del
self
.
_keys
[
index
]
return
0
,
0
else
:
raise
KeyError
(
key
)
def
__getitem__
(
self
,
i
):
...
...
@@ -646,7 +638,6 @@ class _Tree(_MappingBase):
bucket
=
self
.
_findbucket
(
min
)
if
bucket
is
not
None
:
return
bucket
.
minKey
(
min
)
else
:
raise
ValueError
(
'empty tree'
)
def
maxKey
(
self
,
max
=
_marker
):
...
...
@@ -926,48 +917,6 @@ class _TreeItems(object):
bucket
=
bucket
.
_next
done
=
1
# class _Slice:
# def __init__(self, base, slice_):
# self.base = base
# start = slice_.start
# end = slice_.end
# if start < 0 or end < 0:
# start, end, self.step, self._len = self._get_len(base, slice_)
# else:
# self.slice_ = slice_
# self.step = slice_.step or 1
# self.start = start
# self.end = end
# def _get_len(self, base, slice_):
# start, end, step = slice_.indices(len(base))
# l = (end - start - 1)//step + 1
# if l < 0:
# l = 0
# return start, end, step, l
# def __getitem__(self, i):
# if isinstance(i, slice):
# return _slice(self, i)
# if i < 0:
# i += len(self)
# if i < 0:
# raise IndexError(i)
# j = i*self.step+self.start
# if i > self.end:
# raise IndexError(i)
# return self.base[j]
# def __len__(self):
# try:
# return self._len
# except AttributeError:
# _, _, _, self._len = self._get_len(self.base, self.slice_)
# return self._len
class
Tree
(
_Tree
):
...
...
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