[Checkins] SVN: BTrees/branches/py3k/ Restore coverage after repairing fsBTree conditional imports.

[Tres Seaver]

Log message for revision 128612:
  Restore coverage after repairing fsBTree conditional imports.

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:57 UTC (rev 128611)
+++ BTrees/branches/py3k/BTrees/fsBTree.py	2012-12-12 14:40:57 UTC (rev 128612)
@@ -73,8 +73,6 @@
     MAX_SIZE = _TREE_SIZE
     _to_key = _to_key
     _to_value = _to_value
-    def MERGE_WEIGHT(self, value, weight):
-        return value
 
 
 class fsTreeSetPy(TreeSet):

Modified: BTrees/branches/py3k/BTrees/tests/test_fsBTree.py
===================================================================
--- BTrees/branches/py3k/BTrees/tests/test_fsBTree.py	2012-12-12 14:40:57 UTC (rev 128611)
+++ BTrees/branches/py3k/BTrees/tests/test_fsBTree.py	2012-12-12 14:40:57 UTC (rev 128612)
@@ -14,12 +14,8 @@
 import unittest
 
 
-class fsBucketTests(unittest.TestCase):
+class fsBucketBase(object):
 
-    def _getTargetClass(self):
-        from BTrees.fsBTree import fsBucket
-        return fsBucket
-
     def _makeOne(self, *args, **kw):
         return self._getTargetClass()(*args, **kw)
 
@@ -43,21 +39,22 @@
         self.assertRaises(ValueError, bucket.fromString, 'xxx')
 
 
-class fsBTreeTests(unittest.TestCase):
+class fsBucketTests(unittest.TestCase, fsBucketBase):
 
     def _getTargetClass(self):
-        from BTrees.fsBTree import fsBTree
-        return fsBTree
+        from BTrees.fsBTree import fsBucket
+        return fsBucket
 
-    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)
+class fsBucketPyTests(unittest.TestCase, fsBucketBase):
 
+    def _getTargetClass(self):
+        from BTrees.fsBTree import fsBucketPy
+        return fsBucketPy
 
+
 def test_suite():
     return unittest.TestSuite((
         unittest.makeSuite(fsBucketTests),
+        unittest.makeSuite(fsBucketPyTests),
     ))