[Checkins] SVN: BTrees/branches/py3k/ fsBTrees don't get merged.

[Tres Seaver]

Log message for revision 128610:
  fsBTrees don't get merged.

Changed:
  _U  BTrees/branches/py3k/
  U   BTrees/branches/py3k/BTrees/fsBTree.py
  U   BTrees/branches/py3k/BTrees/tests/test_fsBTree.py

-=-
Modified: BTrees/branches/py3k/BTrees/fsBTree.py
===================================================================
--- BTrees/branches/py3k/BTrees/fsBTree.py	2012-12-12 14:40:54 UTC (rev 128609)
+++ BTrees/branches/py3k/BTrees/fsBTree.py	2012-12-12 14:40:55 UTC (rev 128610)
@@ -46,9 +46,6 @@
     _to_key = _to_key
     _to_value = _to_value
 
-    def MERGE_WEIGHT(self, value, weight):
-        return value
-
     def toString(self):
         return ''.join(self._keys) + ''.join(self._values)
 

Modified: BTrees/branches/py3k/BTrees/tests/test_fsBTree.py
===================================================================
--- BTrees/branches/py3k/BTrees/tests/test_fsBTree.py	2012-12-12 14:40:54 UTC (rev 128609)
+++ BTrees/branches/py3k/BTrees/tests/test_fsBTree.py	2012-12-12 14:40:55 UTC (rev 128610)
@@ -23,10 +23,6 @@
     def _makeOne(self, *args, **kw):
         return self._getTargetClass()(*args, **kw)
 
-    def test_MERGE_WEIGHT(self):
-        bucket = self._makeOne()
-        self.assertEqual(bucket.MERGE_WEIGHT(42, 17), 42)
-
     def test_toString(self):
         bucket = self._makeOne([(c*2, c*6) for c in 'abcdef'])
         self.assertEqual(bucket.toString(),