Merge branch 'exercise_16_26' of github.com:beladiyadarshan/py into exercise_16_26

Author: Karandeep Grover

Basics/Hindi/17_inheritance/inheritace.py

@@ -1,15 +1,14 @@
-class Father:
-  def __init__(self, name, lastname):
-    self.name = name
-    self.lastname = lastname
+class Animal:
+  def __init__(self, living_place):
+    self.living_place = living_place
 
-  def printname(self):
-    print(self.name, self.lastname)
+  def printplace(self):
+    print(self.living_place)
 
-class Son(Father):
-  def __init__(self, name, lastname):
-    super().__init__(name, lastname)
+class Dog(Animal):
+  def __init__(self, living_place):
+    super().__init__(living_place)
 
-x = Son("Darshan", "Beladiya")
-x.printname()
+x = Dog("zoo")
+x.printplace()
 

Basics/Hindi/17_inheritance/inheritance.md

@@ -1,21 +1,21 @@
 ## Exercise: Inheritance
 
-1. create inheritance using father son relation on printname.
+1. create inheritance using animal dog relation.
 
 
 ```
 for example, 
-    father and son both has name so create a method for printname by passing firstname and lastname 
+    animal and dog both has same living_place so create a method for living_place 
 ```
 
 2. use super() constructor for calling parent constructor.
 
 ```
-class father:
+class animal:
     #code
 
-class son(father):
-    super()-it refers father class,now you can call father's methods.
+class dog(animal):
+    super()-it refers animal class,now you can call animal's methods.
 ```
 
 [Solution](https://github.com/codebasics/py/blob/master/Basics/python_basics/17_inheritance/17_inheritance.py)

Basics/Hindi/18_multiple_inheritance/multiple_inheritance.md

@@ -1,13 +1,21 @@
 ## Exercise: Multiple Inheritance
 
 Real Life Example :
-1. Create multiple inheritance in mario game 
+1. Create multiple inheritance on teacher,student and youtuber.
 
 
 ```
-Q. if we have created Mario Game with only move module and now we wants to add jump as well as eat then what??? 
+Q. if we have created teacher and now one student joins master degree with becoming teacher then what??
+
+Ans :  just make subclass from  teacher so that student will become teacher
+```
+
+2. Now student is teacher as well as youtuber then what???
+
+
+```
+-just use multiple inheritance for these three relations
 
-Ans :  just make subclass from mario and add extra methods so that we will be having expanded class.
 ```
 
 

Basics/Hindi/18_multiple_inheritance/multiple_inheritance.py

@@ -1,20 +1,20 @@
-class superMario():                                                            
-    def move(self):                                             
-        print('I am moving')
+class Teacher():                                                            
+    def teachers_action(self):                                             
+        print('I can teach')
 
 
-class jump():                                            
-    def jump_above(self):
-            print('I just jumped')
+class Engineer():                                            
+    def Engineers_action(self):
+            print('I can code')
 
-class mushroom():                                             
-    def eat_mushroom(self):
-            print('I have become big now')
+class Youtuber():                                             
+    def youtubers_action(self):
+            print('I can code and teach')
 
 
-class Mario(superMario, mushroom, jump):    
+class Person(Teacher, Engineer, Youtuber):    
         pass                                                                 
-play = Mario()                                           
-play.move()                                                        
-play.eat_mushroom() 
-play.jump_above()
+coder = Person()                                           
+coder.teachers_action()
+coder.Engineers_action()
+coder.youtubers_action()