[geneagrapher] 161/226: The Node.__str__ method was essentially a __str__ for Record. Moved the Node __str__ method to Record and now have Node.__str__ call Record.__str__.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository geneagrapher.

commit fd31d4c4777437723d895aa940d271453e3147da
Author: David Alber <alber.david at gmail.com>
Date:   Mon Oct 31 22:04:41 2011 -0700

    The Node.__str__ method was essentially a __str__ for Record. Moved
    the Node __str__ method to Record and now have Node.__str__ call
    Record.__str__.
---
 geneagrapher/graph/node.py   | 11 +----------
 geneagrapher/graph/record.py | 12 ++++++++++++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/geneagrapher/graph/node.py b/geneagrapher/graph/node.py
index bd26fcf..922b5b4 100644
--- a/geneagrapher/graph/node.py
+++ b/geneagrapher/graph/node.py
@@ -29,16 +29,7 @@ class Node:
             raise TypeError("Unexpected parameter type: expected list object for 'descendants'")
 
     def __str__(self):
-        if self.record.has_institution():
-            if self.record.has_year():
-                return self.record.name.encode('utf-8', 'replace') + ' \\n' + self.record.institution.encode('utf-8', 'replace') + ' (' + str(self.record.year) + ')'
-            else:
-                return self.record.name.encode('utf-8', 'replace') + ' \\n' + self.record.institution.encode('utf-8', 'replace')
-        else:
-            if self.record.has_year():
-                return self.record.name.encode('utf-8', 'replace') + ' \\n(' + str(self.record.year) + ')'
-            else:
-                return self.record.name.encode('utf-8', 'replace')
+        return str(self.record)
 
     def __cmp__(self, n2):
         return self.record.__cmp__(n2.record)
diff --git a/geneagrapher/graph/record.py b/geneagrapher/graph/record.py
index db372a3..59d242c 100644
--- a/geneagrapher/graph/record.py
+++ b/geneagrapher/graph/record.py
@@ -33,6 +33,18 @@ class Record:
         Compare a pair of mathematician records based on ids.
         """
         return self.id.__cmp__(r2.id)
+
+    def __str__(self):
+        if self.has_institution():
+            if self.has_year():
+                return self.name.encode('utf-8', 'replace') + ' \\n' + self.institution.encode('utf-8', 'replace') + ' (' + str(self.year) + ')'
+            else:
+                return self.name.encode('utf-8', 'replace') + ' \\n' + self.institution.encode('utf-8', 'replace')
+        else:
+            if self.has_year():
+                return self.name.encode('utf-8', 'replace') + ' \\n(' + str(self.year) + ')'
+            else:
+                return self.name.encode('utf-8', 'replace')
     
     def has_institution(self):
         """

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/geneagrapher.git