about_modules.py: Copy old Python 2 fixes to Python 3 version. (gregmalcolm#144)

kjc · mpirnat · commit ca7f7ac695f8 · 2016-09-30T19:02:00.000-04:00
* about_modules: Py3 now mostly matches Py2 version. Ported changes made to the Python 2 version of about_modules.py (sha d65e690, 2012-02-10) to the Python 3 version. They are now identical, except that the Python 3 version... 1. ...uses the new relative import syntax. 2. ...uses with-assertRaises(): instead of try-except. This changed one test name, but otherwise only comments and docstrings. * about_modules: Renamed test about __all__. In Python 2 and 3 versions, renamed the test method test_a_modules_XallX_statement_limits_what_wildcards_will_match to test_a_module_can_limit_wildcard_imports. Also, reformatted its docstring to put the Python code on its own line.
diff --git a/python2/koans/about_modules.py b/python2/koans/about_modules.py
@@ -60,8 +60,11 @@ def test_private_attributes_are_still_accessible_in_modules(self):
         # module level attribute hiding doesn't affect class attributes
         # (unless the class itself is hidden).
 
-    def test_a_modules_XallX_statement_limits_what_wildcards_will_match(self):
-        """Examine results of from local_module_with_all_defined import *"""
+    def test_a_module_can_limit_wildcard_imports(self):
+        """
+        Examine results of:
+            from local_module_with_all_defined import *
+        """
 
         # 'Goat' is on the __all__ list
         goat = Goat()
diff --git a/python3/koans/about_modules.py b/python3/koans/about_modules.py
@@ -11,17 +11,18 @@
 from .another_local_module import *
 from .local_module_with_all_defined import *
 
+
 class AboutModules(Koan):
     def test_importing_other_python_scripts_as_modules(self):
-        from . import local_module # local_module.py
+        from . import local_module  # local_module.py
 
         duck = local_module.Duck()
         self.assertEqual(__, duck.name)
 
     def test_importing_attributes_from_classes_using_from_keyword(self):
         from .local_module import Duck
 
-        duck = Duck() # no module qualifier needed this time
+        duck = Duck()  # no module qualifier needed this time
         self.assertEqual(__, duck.name)
 
     def test_we_can_import_multiple_items_at_once(self):
@@ -33,10 +34,11 @@ def test_we_can_import_multiple_items_at_once(self):
         self.assertEqual(__, joes_dog.identify())
 
     def test_importing_all_module_attributes_at_once(self):
-        # NOTE Using this module level import declared at the top of this script:
-        #   from .another_local_module import *
-        #
-        # Import wildcard cannot be used from within classes or functions
+        """
+        importing all attributes at once is done like so:
+            from .another_local_module import *
+        The import wildcard cannot be used from within classes or functions.
+        """
 
         goose = Goose()
         hamster = Hamster()
@@ -45,21 +47,24 @@ def test_importing_all_module_attributes_at_once(self):
         self.assertEqual(__, hamster.name)
 
     def test_modules_hide_attributes_prefixed_by_underscores(self):
-        with self.assertRaises(___): private_squirrel = _SecretSquirrel()
+        with self.assertRaises(___):
+            private_squirrel = _SecretSquirrel()
 
     def test_private_attributes_are_still_accessible_in_modules(self):
-        from .local_module import Duck # local_module.py
+        from .local_module import Duck  # local_module.py
 
         duck = Duck()
         self.assertEqual(__, duck._password)
         # module level attribute hiding doesn't affect class attributes
         # (unless the class itself is hidden).
 
-    def test_a_module_can_choose_which_attributes_are_available_to_wildcards(self):
-        # NOTE Using this module level import declared at the top of this script:
-        #   from .local_module_with_all_defined import *
+    def test_a_module_can_limit_wildcard_imports(self):
+        """
+        Examine results of:
+            from .local_module_with_all_defined import *
+        """
 
-        # 'Goat' is on the __ALL__ list
+        # 'Goat' is on the __all__ list
         goat = Goat()
         self.assertEqual(__, goat.name)
 
@@ -68,4 +73,5 @@ def test_a_module_can_choose_which_attributes_are_available_to_wildcards(self):
         self.assertEqual(__, lizard.name)
 
         # SecretDuck? Never heard of her!
-        with self.assertRaises(___): duck = SecretDuck()
+        with self.assertRaises(___):
+            duck = SecretDuck()
