Updated From import

Author: sofiiako

Modules and packages/From import/calculator.py

@@ -1,14 +1,36 @@
 """
-This module contains Calculator class
+This module contains calculator classes
 """
 
 
-class Calculator:
+class Add:
     def __init__(self):
         self.current = 0
 
     def add(self, amount):
         self.current += amount
 
+    def get_current(self):
+        return self.current
+
+
+class Subtract:
+    def __init__(self):
+        self.current = 0
+
+    def subtract(self, amount):
+        self.current -= amount
+
+    def get_current(self):
+        return self.current
+
+
+class Multiply:
+    def __init__(self):
+        self.current = 0
+
+    def multiply(self, amount):
+        self.current *= amount
+
     def get_current(self):
         return self.current

Modules and packages/From import/from_import.py

@@ -1,10 +1,10 @@
+from calculator import Add
+from my_module import hello as hey
 
-from calculator import Calculator
 
-calc = Calculator()    # here we can use Calculator class directly without prefix calculator.
+calc = Add()  # name `Calculator` used directly without prefix `calculator`
 calc.add(2)
 print(calc.get_current())
 
-from my_module import hello_world
 
-print(hello_world())    # Note: hello_world function used without prefix
+print(hey("User"))

Modules and packages/From import/my_module.py

@@ -1,7 +1,7 @@
 """ documentation string for module my_module
-This module contains hello_world function
+This module contains hello function
 """
 
 
-def hello_world():
-    return "Hello, World!"
+def hello(name):
+    return f"Hey there, {name}!"

Modules and packages/From import/task-info.yaml

@@ -7,8 +7,11 @@ files:
 - name: from_import.py
   visible: true
   placeholders:
-  - offset: 169
-    length: 33
-    placeholder_text: import hello_world from my_module
+  - offset: 186
+    length: 11
+    placeholder_text: '# call the imported function to print your name'
+  - offset: 27
+    length: 34
+    placeholder_text: '# Import the function here'
 - name: tests.py
   visible: false

Modules and packages/From import/task.md

@@ -1,7 +1,45 @@
 ## from import
 
-One form of the import statement imports names `from` a module directly into the importing module's symbol table. This way you can use the imported name directly without the `module_name` prefix.  
-  
-Import `hello_world` function from `my_module` . Check the difference with task1.  
+One form of the import statement imports names `from` a module directly into the 
+importing module's symbol table. This way you can use the imported name directly 
+without the `module_name` prefix.  For example:
 
-<div class='hint'>Use 'from my_module import hello_world'</div>
+```python
+from calculator import Add
+
+calc = Add()    # name `Calculator` used directly without prefix `calculator`
+```
+
+This does not introduce the module name from which the imports are taken in the 
+local symbol table (so in our example, `calculator` is not defined).
+
+There is even a variant to import all names that a module defines:
+```python
+from calculator import *
+calc = Multiply()
+```
+This imports all names (except those beginning with an underscore `_`). 
+In most cases Python programmers do not use this facility since it introduces 
+an unknown set of names into the interpreter, possibly hiding some things 
+you have already defined.
+
+If the module name is followed by as, then the name following as is bound 
+directly to the imported module:
+
+```python
+import my_module as mm
+mm.hello_world()
+```
+This is effectively importing the module in the same way that `import my_module` will 
+do, with the only difference of it being available as `mm`. It can also be used 
+when utilising `from` with similar effects:
+
+```python
+from calculator import Subtract as Minus
+```
+
+Import the `hello` function from `my_module` as `hey` and call it to print your name.
+
+<div class='hint'>Use syntax such as <code>from some_module import some_func as func</code>.</div>
+<div class="hint">Note: <code>hey</code> function should be called without a prefix. The function expects
+one string argument.</div>

Modules and packages/From import/tests.py

@@ -3,10 +3,19 @@
 
 def test_window():
     window = get_answer_placeholders()[0]
-    if "from " in window:
+    if "from" in window:
         passed()
     else:
-        failed("Use hello_world imported from my_module")
+        failed("Wrong import, check out hint 1")
+
+
+def test_window_1():
+    window = get_answer_placeholders()[1]
+    if "hey('" in window or 'hey("' in window:
+        passed()
+    else:
+        failed("Call the hey function and give it our name as a string!")
+
 
 if __name__ == '__main__':
     run_common_tests()