Changeset 347

Timestamp:

06/21/08 22:08:10 (4 years ago)

Author:

simon

Message:

Use new-style classes.

Files:

• hodgestar/Talks/PythonObjects/slides.py (modified) (8 diffs)

hodgestar/Talks/PythonObjects/slides.py

@@ -34 +34 @@
 
 
-class Lecture:
+class Lecture(object):
     """A series of slides.
 
@@ -114 +114 @@
         fp.close()
 
-
-class Slide:
+class LecturePart(object):
+    """Base class for parts of a lecture."""
+
+    def toHTML(self):
+        """Return HTML for inclusion in lecture."""
+        raise NotImplementedError
+
+class Slide(LecturePart):
     """A slide that contains unnumbered bullets.
 
@@ -150 +156 @@
 
 
-class SubBullet:
+class SubBullet(LecturePart):
     """A list of bullets that isn't a slide.
 
@@ -167 +173 @@
 
 
-class Bullet:
+class Bullet(LecturePart):
     """A bullet."""
 
@@ -177 +183 @@
 
 
-class PRE:
+class PRE(LecturePart):
     """A quoted text."""
 
@@ -187 +193 @@
 
 
-class URL:
+class URL(LecturePart):
     """A URL."""
     def __init__(self, text):
@@ -194 +200 @@
     def toHTML(self):
         return '<a href="%s">%s</a>' % (self.text, self.text)
+
+class Heading(LecturePart):
+    """A heading of a given level (1, 2, ...)."""
+    def __init__(self, num, text):
+        self.num = num
+        self.text = text
+
+    def toHTML(self):
+        return '<h%d>%s</h%d>' % (self.num, toHTML(self.text), self.num)
+
+
+class Center(LecturePart):
+    """Center an item."""
+
+    def __init__(self, text):
+        self.text = text
+
+    def toHTML(self):
+        return '<center>%s</center>' % toHTML(self.text)
+
+
+class Image(LecturePart):
+    """An image."""
+
+    def __init__(self, image, description=""):
+        self.image = image
+        self.description = description
+
+    def toHTML(self):
+        return "<img src='%s' alt='%s' />" % (self.image, self.description)
+
+
+class TitleSlide(Slide):
+
+    def toHTML(self):
+        title = '<h1>%s</h1>' % toHTML(Center(self.title))
+        points = []
+        for point in self.bullets:
+            points.append(Center(point).toHTML())
+        return title + '\n'.join(points)
 
 
@@ -204 +250 @@
 
 
-class Heading:
-    """A heading of a given level (1, 2, ...)."""
-    def __init__(self, num, text):
-        self.num = num
-        self.text = text
-
-    def toHTML(self):
-        return '<h%d>%s</h%d>' % (self.num, toHTML(self.text), self.num)
-
-
-class Center:
-    """Center an item."""
-
-    def __init__(self, text):
-        self.text = text
-
-    def toHTML(self):
-        return '<center>%s</center>' % toHTML(self.text)
-
-
-class Image:
-    """An image."""
-
-    def __init__(self, image, description=""):
-        self.image = image
-        self.description = description
-
-    def toHTML(self):
-        return "<img src='%s' alt='%s' />" % (self.image, self.description)
-
-
-class TitleSlide(Slide):
-
-    def toHTML(self):
-        title = '<h1>%s</h1>' % toHTML(Center(self.title))
-        points = []
-        for point in self.bullets:
-            points.append(Center(point).toHTML())
-        return title + '\n'.join(points)
-
-
 __all__ = ["Lecture", "Slide", "NumSlide", "PRE", "URL", "Bullet",
            "SubBullet", "toHTML", "Center", "Heading", "Image", "TitleSlide"]