1.1 --- a/lib/__builtins__/core.py Sun Jan 22 01:16:01 2017 +0100
1.2 +++ b/lib/__builtins__/core.py Sun Jan 22 21:46:37 2017 +0100
1.3 @@ -41,7 +41,10 @@
1.4
1.5 "Return a string representation."
1.6
1.7 - return str(buffer(["<", self.__oname__, ".", self.__name__, " instance>"]))
1.8 + # The string representation of the class should be provided by the
1.9 + # type.__str__ method using the class as self.
1.10 +
1.11 + return str(buffer(["<", self.__class__, " instance>"]))
1.12
1.13 __repr__ = __str__
1.14
1.15 @@ -56,13 +59,13 @@
1.16 """
1.17
1.18 self.__file__ = None
1.19 - self.__mname__ = None
1.20 + self.__name__ = None
1.21
1.22 def __str__(self):
1.23
1.24 "Return a string representation."
1.25
1.26 - return self.__mname__
1.27 + return self.__name__
1.28
1.29 __repr__ = __str__
1.30
1.31 @@ -81,8 +84,8 @@
1.32
1.33 self.__fn__ = None
1.34 self.__args__ = None
1.35 - self.__fname__ = None
1.36 - self.__oname__ = None
1.37 + self.__name__ = None
1.38 + self.__parent__ = None
1.39
1.40 def __bool__(self):
1.41
1.42 @@ -94,7 +97,9 @@
1.43
1.44 "Return a string representation."
1.45
1.46 - return str(buffer([self.__oname__, ".", self.__fname__]))
1.47 + # Combine the function's parent representation with the function's name.
1.48 +
1.49 + return str(buffer([self.__parent__, ".", self.__name__]))
1.50
1.51 __repr__ = __str__
1.52
1.53 @@ -110,7 +115,10 @@
1.54
1.55 "Return a string representation."
1.56
1.57 - return str(buffer([self.__oname__, ".", self.__name__]))
1.58 + # With the class as self, combine the class's parent representation with
1.59 + # the class's name.
1.60 +
1.61 + return str(buffer([self.__parent__, ".", self.__name__]))
1.62
1.63 __repr__ = __str__
1.64