Fixing errors

Author: BrianKani

0x0A-python-inheritance/10-square.py

@@ -1,15 +1,19 @@
 #!/usr/bin/python3
+"""
+Contains the class BaseGeometry and subclass Rectangle
+"""
+
 Rectangle = __import__('9-rectangle').Rectangle
 
 
 class Square(Rectangle):
-    """ Class that defines a Square from Rectangle class """
+    """A representation of a square"""
     def __init__(self, size):
-        """ Method that initializes a Square """
+        """instantiation of the square"""
         self.integer_validator("size", size)
         self.__size = size
-        super().__init__(self.__size, self.__size)
+        super().__init__(size, size)
 
     def area(self):
-        """ Method that returns a string with the area """
-        return super().area()
+        """"returns the area of the square"""
+        return self.__size ** 2

0x0A-python-inheritance/100-my_int.py

@@ -1,11 +1,19 @@
 #!/usr/bin/python3
+"""
+Contains the class MyInt
+"""
+
+
 class MyInt(int):
-    """ Class that inherits from class int"""
+    """rebel version of an integer, perfect for opposite day!"""
+    def __new__(cls, *args, **kwargs):
+        """create a new instance of the class"""
+        return super(MyInt, cls).__new__(cls, *args, **kwargs)
 
     def __eq__(self, other):
-        """ Method that returns != check """
-        return int.__ne__(self, other)
+        """what was != is now =="""
+        return int(self) != other
 
     def __ne__(self, other):
-        """ Method that returns == check """
-        return int.__eq__(self, other)
+        """what was == is now !="""
+        return int(self) == other

0x0A-python-inheritance/101-add_attribute.py

@@ -1,17 +1,10 @@
 #!/usr/bin/python3
-def add_attribute(obj, name, value):
-    """ Function that adds a new attribute to an object
+""" A attribute adding module """
 
-    Args:
-        obj: object
-        name: attribute name
-        value: attribute value
 
-    Raises:
-        TypeError: when the attribute can't be added
-
-    """
-
-    if not hasattr(obj, "__dict__"):
+def add_attribute(a_class, name, value):
+    """ Adds a new attribute to an object if it’s possible """
+    if hasattr(a_class, "__dict__"):
+        setattr(a_class, name, value)
+    else:
         raise TypeError("can't add new attribute")
-    setattr(obj, name, value)

0x0A-python-inheritance/11-square.py

@@ -1,19 +1,53 @@
 #!/usr/bin/python3
-Rectangle = __import__('9-rectangle').Rectangle
+"""
+Contains the class BaseGeometry and subclass Rectangle
+"""
+
+
+class BaseGeometry:
+    """A class with public instance methods area and integer_validator"""
+    def area(self):
+        """raises an exception when called"""
+        raise Exception("area() is not implemented")
+
+    def integer_validator(self, name, value):
+        """validates that value is an integer greater than 0"""
+        if type(value) is not int:
+            raise TypeError("{:s} must be an integer".format(name))
+        if value <= 0:
+            raise ValueError("{:s} must be greater than 0".format(name))
+
+
+class Rectangle(BaseGeometry):
+    """A representation of a rectangle"""
+    def __init__(self, width, height):
+        """instantiation of the rectangle"""
+        self.integer_validator("width", width)
+        self.__width = width
+        self.integer_validator("height", height)
+        self.__height = height
+
+    def area(self):
+        """returns the area of the rectangle"""
+        return self.__width * self.__height
+
+    def __str__(self):
+        """informal string representation of the rectangle"""
+        return "[Rectangle] {:d}/{:d}".format(self.__width, self.__height)
 
 
 class Square(Rectangle):
-    """ Class that defines a Square from Rectangle class """
+    """A representation of a square"""
     def __init__(self, size):
-        """ Method that initializes a Square """
+        """instantiation of the square"""
         self.integer_validator("size", size)
         self.__size = size
-        super().__init__(self.__size, self.__size)
+        super().__init__(size, size)
 
     def area(self):
-        """ Method that returns a string with the area """
-        return super().area()
+        """"returns the area of the square"""
+        return self.__size ** 2
 
     def __str__(self):
-        """ Special method that returns a printable string """
-        return "[Square] {}/{}".format(self.__size, self.__size)
+        """informal string reepresentation of the square"""
+        return "[Square] {:d}/{:d}".format(self.__size, self.__size)

0x0A-python-inheritance/2-is_same_class.py

@@ -1,13 +1,9 @@
 #!/usr/bin/python3
-def is_same_class(obj, a_class):
-    """ Function that returns True/False if obj is a type of a_class
+"""
+This module contains the function is_same_class
+"""
 
-    Args:
-        obj: object
-        a_class: class type
 
-    Returns:
-        True if type of obj is a_class
-        False, otherwise
-    """
-    return type(obj) is a_class
+def is_same_class(obj, a_class):
+    """return true if obj is the exact class a_class, otherwise false"""
+    return (type(obj) == a_class)

0x0A-python-inheritance/3-is_kind_of_class.py

@@ -1,13 +1,9 @@
 #!/usr/bin/python3
-def is_kind_of_class(obj, a_class):
-    """ Function that returns True/False if obj is an instance of a_class
+"""
+Contains the is_kind_of_class function
+"""
 
-    Args:
-        obj: object
-        a_class: class type
 
-    Returns:
-        True if obj is an instance of a_class
-        False, otherwise
-    """
-    return isinstance(obj, a_class)
+def is_kind_of_class(obj, a_class):
+    """True if obj is an instance or inherited from a_class, else False"""
+    return (isinstance(obj, a_class))

0x0A-python-inheritance/4-inherits_from.py

@@ -1,15 +1,10 @@
 #!/usr/bin/python3
-def inherits_from(obj, a_class):
-    """ Function that returns True/False if obj is an instance of a_class
+"""
+Contains the inherits_from function
+"""
 
-    Args:
-        obj: object
-        a_class: class type
 
-    Returns:
-        True if obj is an instance of a_class
-        False, otherwise
-    """
-    if type(obj) is a_class:
-        return False
-    return isinstance(obj, a_class)
+def inherits_from(obj, a_class):
+    """returns true if obj is a subclass of a_class, otherwise false"""
+#!/usr/bin/python3
+    return(issubclass(type(obj), a_class) and type(obj) != a_class)

0x0A-python-inheritance/5-base_geometry.py

@@ -1,4 +1,9 @@
 #!/usr/bin/python3
+"""
+Contains the class BaseGeometry
+"""
+
+
 class BaseGeometry:
-    """ Empty class """
+    """An empty class"""
     pass

0x0A-python-inheritance/6-base_geometry.py

@@ -1,5 +1,11 @@
 #!/usr/bin/python3
+"""
+Contains the class BaseGeometry
+"""
+
+
 class BaseGeometry:
-    """ Empty class """
+    """A class with public attribute area"""
     def area(self):
+        """raises an exception when called"""
         raise Exception("area() is not implemented")

0x0A-python-inheritance/7-base_geometry.py

@@ -1,22 +1,18 @@
 #!/usr/bin/python3
-class BaseGeometry:
-    """ Class that defines the attributes of Geometric Shapes """
+"""
+Contains the class BaseGeometry
+"""
 
-    def area(self):
-        """ Method that defines the area of a geomtric shape """
 
+class BaseGeometry:
+    """A class with public instance methods area and integer_validator"""
+    def area(self):
+        """raises an exception when called"""
         raise Exception("area() is not implemented")
 
     def integer_validator(self, name, value):
-        """ Method that recieves the value property
-
-        Árgs:
-            name: name of the object
-            value: value of the property
-
-        """
-
+        """validates that value is an integer greater than 0"""
         if type(value) is not int:
-            raise TypeError("{} must be an integer".format(name))
+            raise TypeError("{:s} must be an integer".format(name))
         if value <= 0:
-            raise ValueError("{} must be greater than 0".format(name))
+            raise ValueError("{:s} must be greater than 0".format(name))

0x0A-python-inheritance/8-rectangle.py

@@ -1,13 +1,16 @@
 #!/usr/bin/python3
+"""
+Contains the class BaseGeometry and subclass Rectangle
+"""
+
 BaseGeometry = __import__('7-base_geometry').BaseGeometry
 
 
 class Rectangle(BaseGeometry):
-    """ Class that defines a rectangle from BaseGeometry Class """
-
+    """A representation of a rectangle"""
     def __init__(self, width, height):
-        """ Initializes instance """
+        """instantiation of the rectangle"""
         self.integer_validator("width", width)
-        self.integer_validator("height", height)
         self.__width = width
+        self.integer_validator("height", height)
         self.__height = height