Rev 4916: Switch CompiledChecksToLines to ModuleAvailableFeature in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-module-available

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-module-available

------------------------------------------------------------
revno: 4916
revision-id: john at arbash-meinel.com-20091221173805-lvtxii221r5pwlta
parent: john at arbash-meinel.com-20091221173611-udyhtty1s2wp0wvc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0rc1-module-available
timestamp: Mon 2009-12-21 11:38:05 -0600
message:
  Switch CompiledChecksToLines to ModuleAvailableFeature
-------------- next part --------------
=== modified file 'bzrlib/tests/test__chunks_to_lines.py'
--- a/bzrlib/tests/test__chunks_to_lines.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/test__chunks_to_lines.py	2009-12-21 17:38:05 +0000
@@ -24,31 +24,19 @@
     # parameterize all tests in this module
     import bzrlib._chunks_to_lines_py as py_module
     scenarios = [('python', {'module': py_module})]
-    if CompiledChunksToLinesFeature.available():
-        import bzrlib._chunks_to_lines_pyx as c_module
-        scenarios.append(('C', {'module': c_module}))
+    if compiled_chunkstolines.available():
+        scenarios.append(('C', {'module': compiled_chunkstolines.module}))
     else:
         # the compiled module isn't available, so we add a failing test
         class FailWithoutFeature(tests.TestCase):
             def test_fail(self):
-                self.requireFeature(CompiledChunksToLinesFeature)
+                self.requireFeature(compiled_chunkstolines)
         standard_tests.addTest(FailWithoutFeature("test_fail"))
     return tests.multiply_tests(standard_tests, scenarios, loader.suiteClass())
 
 
-class _CompiledChunksToLinesFeature(tests.Feature):
-
-    def _probe(self):
-        try:
-            import bzrlib._chunks_to_lines_pyx
-        except ImportError:
-            return False
-        return True
-
-    def feature_name(self):
-        return 'bzrlib._chunks_to_lines_pyx'
-
-CompiledChunksToLinesFeature = _CompiledChunksToLinesFeature()
+compiled_chunkstolines = tests.ModuleAvailableFeature(
+                            'bzrlib._chunks_to_lines_pyx')
 
 
 class TestChunksToLines(tests.TestCase):

=== modified file 'bzrlib/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py	2009-12-09 15:09:00 +0000
+++ b/bzrlib/tests/test_osutils.py	2009-12-21 17:38:05 +0000
@@ -989,7 +989,7 @@
 
     def test_osutils_binding(self):
         from bzrlib.tests import test__chunks_to_lines
-        if test__chunks_to_lines.CompiledChunksToLinesFeature.available():
+        if test__chunks_to_lines.compiled_chunkstolines.available():
             from bzrlib._chunks_to_lines_pyx import chunks_to_lines
         else:
             from bzrlib._chunks_to_lines_py import chunks_to_lines