1
=== modified file 'breezy/fifo_cache.py'
2
--- breezy/fifo_cache.py	2017-06-05 20:48:31 +0000
3
+++ breezy/fifo_cache.py	2017-06-05 23:20:35 +0000
4
@@ -16,7 +16,7 @@
5
16
16
6
17
"""A simple first-in-first-out (FIFO) cache."""
17
"""A simple first-in-first-out (FIFO) cache."""
7
18
18
9
19
from __future__ import absolute_import
19
from __future__ import absolute_import, division
10
20
20
11
21
from collections import deque
21
from collections import deque
12
22
22
13
@@ -28,7 +28,7 @@
14
28
        dict.__init__(self)
28
        dict.__init__(self)
15
29
        self._max_cache = max_cache
29
        self._max_cache = max_cache
16
30
        if after_cleanup_count is None:
30
        if after_cleanup_count is None:
18
31
            self._after_cleanup_count = self._max_cache * 8 / 10
31
            self._after_cleanup_count = self._max_cache * 8 // 10
19
32
        else:
32
        else:
20
33
            self._after_cleanup_count = min(after_cleanup_count,
33
            self._after_cleanup_count = min(after_cleanup_count,
21
34
                                            self._max_cache)
34
                                            self._max_cache)
22
@@ -123,7 +123,7 @@
23
123
        """
123
        """
24
124
        self._max_cache = max_cache
124
        self._max_cache = max_cache
25
125
        if after_cleanup_count is None:
125
        if after_cleanup_count is None:
27
126
            self._after_cleanup_count = max_cache * 8 / 10
126
            self._after_cleanup_count = max_cache * 8 // 10
28
127
        else:
127
        else:
29
128
            self._after_cleanup_count = min(max_cache, after_cleanup_count)
128
            self._after_cleanup_count = min(max_cache, after_cleanup_count)
30
129
        if len(self) > self._max_cache:
129
        if len(self) > self._max_cache:
31
@@ -193,7 +193,7 @@
32
193
        FIFOCache.__init__(self, max_cache=max_size)
193
        FIFOCache.__init__(self, max_cache=max_size)
33
194
        self._max_size = max_size
194
        self._max_size = max_size
34
195
        if after_cleanup_size is None:
195
        if after_cleanup_size is None:
36
196
            self._after_cleanup_size = self._max_size * 8 / 10
196
            self._after_cleanup_size = self._max_size * 8 // 10
37
197
        else:
197
        else:
38
198
            self._after_cleanup_size = min(after_cleanup_size, self._max_size)
198
            self._after_cleanup_size = min(after_cleanup_size, self._max_size)
39
199
199
40
@@ -262,7 +262,7 @@
41
262
        FIFOCache.resize(self, max_size)
262
        FIFOCache.resize(self, max_size)
42
263
        self._max_size = max_size
263
        self._max_size = max_size
43
264
        if after_cleanup_size is None:
264
        if after_cleanup_size is None:
45
265
            self._after_cleanup_size = max_size * 8 / 10
265
            self._after_cleanup_size = max_size * 8 // 10
46
266
        else:
266
        else:
47
267
            self._after_cleanup_size = min(max_size, after_cleanup_size)
267
            self._after_cleanup_size = min(max_size, after_cleanup_size)
48
268
        if self._value_size > self._max_size:
268
        if self._value_size > self._max_size:
Status:	Merged
Approved by:	Jelmer Vernooij on 2017-06-05
Approved revision:	no longer in the source branch.
Merge reported by:	The Breezy Bot
Merged at revision:	not available
Proposed branch:	lp:~gz/brz/fifo_future_division
Merge into:	lp:brz
Diff against target:	48 lines (+5/-5) 1 file modified breezy/fifo_cache.py (+5/-5)
To merge this branch:	bzr merge lp:~gz/brz/fifo_future_division
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Jelmer Vernooij		2017-06-05	Approve on 2017-06-05
Review via email: mp+325125@code.launchpad.net
1	=== modified file 'breezy/fifo_cache.py'
2	--- breezy/fifo_cache.py 2017-06-05 20:48:31 +0000
3	+++ breezy/fifo_cache.py 2017-06-05 23:20:35 +0000
4	@@ -16,7 +16,7 @@
5	16		16
6	17	"""A simple first-in-first-out (FIFO) cache."""	17	"""A simple first-in-first-out (FIFO) cache."""
7	18		18
9	19	from __future__ import absolute_import	19	from __future__ import absolute_import, division
10	20		20
11	21	from collections import deque	21	from collections import deque
12	22		22
13	@@ -28,7 +28,7 @@
14	28	dict.__init__(self)	28	dict.__init__(self)
15	29	self._max_cache = max_cache	29	self._max_cache = max_cache
16	30	if after_cleanup_count is None:	30	if after_cleanup_count is None:
18	31	self._after_cleanup_count = self._max_cache * 8 / 10	31	self._after_cleanup_count = self._max_cache * 8 // 10
19	32	else:	32	else:
20	33	self._after_cleanup_count = min(after_cleanup_count,	33	self._after_cleanup_count = min(after_cleanup_count,
21	34	self._max_cache)	34	self._max_cache)
22	@@ -123,7 +123,7 @@
23	123	"""	123	"""
24	124	self._max_cache = max_cache	124	self._max_cache = max_cache
25	125	if after_cleanup_count is None:	125	if after_cleanup_count is None:
27	126	self._after_cleanup_count = max_cache * 8 / 10	126	self._after_cleanup_count = max_cache * 8 // 10
28	127	else:	127	else:
29	128	self._after_cleanup_count = min(max_cache, after_cleanup_count)	128	self._after_cleanup_count = min(max_cache, after_cleanup_count)
30	129	if len(self) > self._max_cache:	129	if len(self) > self._max_cache:
31	@@ -193,7 +193,7 @@
32	193	FIFOCache.__init__(self, max_cache=max_size)	193	FIFOCache.__init__(self, max_cache=max_size)
33	194	self._max_size = max_size	194	self._max_size = max_size
34	195	if after_cleanup_size is None:	195	if after_cleanup_size is None:
36	196	self._after_cleanup_size = self._max_size * 8 / 10	196	self._after_cleanup_size = self._max_size * 8 // 10
37	197	else:	197	else:
38	198	self._after_cleanup_size = min(after_cleanup_size, self._max_size)	198	self._after_cleanup_size = min(after_cleanup_size, self._max_size)
39	199		199
40	@@ -262,7 +262,7 @@
41	262	FIFOCache.resize(self, max_size)	262	FIFOCache.resize(self, max_size)
42	263	self._max_size = max_size	263	self._max_size = max_size
43	264	if after_cleanup_size is None:	264	if after_cleanup_size is None:
45	265	self._after_cleanup_size = max_size * 8 / 10	265	self._after_cleanup_size = max_size * 8 // 10
46	266	else:	266	else:
47	267	self._after_cleanup_size = min(max_size, after_cleanup_size)	267	self._after_cleanup_size = min(max_size, after_cleanup_size)
48	268	if self._value_size > self._max_size:	268	if self._value_size > self._max_size: