Rev 4937: Track down a few more import typos. 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: 4937
revision-id: john at arbash-meinel.com-20091222164048-hp13oi0wck4mg5sq
parent: john at arbash-meinel.com-20091222163807-r830e96m84nuj45r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0rc1-module-available
timestamp: Tue 2009-12-22 10:40:48 -0600
message:
  Track down a few more import typos.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_groupcompress.py'
--- a/bzrlib/tests/test_groupcompress.py	2009-12-21 18:00:02 +0000
+++ b/bzrlib/tests/test_groupcompress.py	2009-12-22 16:40:48 +0000
@@ -29,7 +29,7 @@
     versionedfile,
     )
 from bzrlib.osutils import sha_string
-from bzrlib.tests.test__groupcompress import compiled_groupcompress
+from bzrlib.tests.test__groupcompress import compiled_groupcompress_feature
 
 
 def load_tests(standard_tests, module, loader):
@@ -39,7 +39,7 @@
     scenarios = [
         ('python', {'compressor': groupcompress.PythonGroupCompressor}),
         ]
-    if compiled_groupcompress.available():
+    if compiled_groupcompress_feature.available():
         scenarios.append(('C',
             {'compressor': groupcompress.PyrexGroupCompressor}))
     return tests.multiply_tests(to_adapt, scenarios, result)
@@ -135,7 +135,7 @@
 
 class TestPyrexGroupCompressor(TestGroupCompressor):
 
-    _test_needs_features = [compiled_groupcompress]
+    _test_needs_features = [compiled_groupcompress_feature]
     compressor = groupcompress.PyrexGroupCompressor
 
     def test_stats(self):

=== modified file 'bzrlib/tests/test_knit.py'
--- a/bzrlib/tests/test_knit.py	2009-12-22 15:50:40 +0000
+++ b/bzrlib/tests/test_knit.py	2009-12-22 16:40:48 +0000
@@ -28,6 +28,7 @@
     multiparent,
     osutils,
     pack,
+    tests,
     )
 from bzrlib.errors import (
     RevisionAlreadyPresent,

=== modified file 'bzrlib/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py	2009-12-22 15:50:40 +0000
+++ b/bzrlib/tests/test_osutils.py	2009-12-22 16:40:48 +0000
@@ -82,7 +82,7 @@
                           dict(_dir_reader_class=_readdir_pyx.UTF8DirReader,
                                _native_to_unicode=_utf8_to_unicode)))
 
-    if test__walkdirs_win32.Win32ReadDirFeature.available():
+    if test__walkdirs_win32.win32_readdir_feature.available():
         try:
             from bzrlib import _walkdirs_win32
             scenarios.append(