Rev 4876: Change from _ModuleFeature to ModuleAvailableFeature, per vila's review. in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-test-imports

John Arbash Meinel john at arbash-meinel.com
Tue Dec 8 21:46:24 GMT 2009


At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-test-imports

------------------------------------------------------------
revno: 4876
revision-id: john at arbash-meinel.com-20091208214607-c5gbkx533wr3eg84
parent: john at arbash-meinel.com-20091208193357-623yeedlab7ao9k3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0b4-win32-test-imports
timestamp: Tue 2009-12-08 15:46:07 -0600
message:
  Change from _ModuleFeature to ModuleAvailableFeature, per vila's review.
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2009-12-08 19:19:51 +0000
+++ b/bzrlib/tests/__init__.py	2009-12-08 21:46:07 +0000
@@ -4247,7 +4247,7 @@
 UnicodeFilenameFeature = _UnicodeFilenameFeature()
 
 
-class _ModuleFeature(Feature):
+class ModuleAvailableFeature(Feature):
     """This is a feature than describes a module we want to be available.
 
     Declare the name of the module in __init__(), and then after probing, the
@@ -4257,7 +4257,7 @@
     """
 
     def __init__(self, module_name):
-        super(_ModuleFeature, self).__init__()
+        super(ModuleAvailableFeature, self).__init__()
         self.module_name = module_name
 
     def _probe(self):

=== modified file 'bzrlib/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py	2009-12-08 19:33:57 +0000
+++ b/bzrlib/tests/test_osutils.py	2009-12-08 21:46:07 +0000
@@ -53,7 +53,7 @@
 
 UTF8DirReaderFeature = _UTF8DirReaderFeature()
 
-TermIOSFeature = tests._ModuleFeature('termios')
+TermIOSFeature = tests.ModuleAvailableFeature('termios')
 
 
 def _already_unicode(s):

=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2009-12-08 19:19:51 +0000
+++ b/bzrlib/tests/test_selftest.py	2009-12-08 21:46:07 +0000
@@ -2497,17 +2497,17 @@
         self.assertIs(feature, exception.args[0])
 
 
-class Test_ModuleFeature(tests.TestCase):
+class TestModuleAvailableFeature(tests.TestCase):
 
     def test_available_module(self):
-        feature = tests._ModuleFeature('bzrlib.tests')
+        feature = tests.ModuleAvailableFeature('bzrlib.tests')
         self.assertEqual('bzrlib.tests', feature.module_name)
         self.assertEqual('bzrlib.tests', str(feature))
         self.assertTrue(feature.available())
         self.assertIs(tests, feature.module)
 
     def test_unavailable_module(self):
-        feature = tests._ModuleFeature('bzrlib.no_such_module_exists')
+        feature = tests.ModuleAvailableFeature('bzrlib.no_such_module_exists')
         self.assertEqual('bzrlib.no_such_module_exists', str(feature))
         self.assertFalse(feature.available())
         self.assertIs(None, feature.module)



More information about the bazaar-commits mailing list