Changeset 344

Timestamp:

06/21/08 21:57:35 (4 years ago)

Author:

simon

Message:

Last minute modifications to slides.

Files:

• hodgestar/Talks/PythonObjects/pyobjects.py (modified) (6 diffs)

hodgestar/Talks/PythonObjects/pyobjects.py

@@ -1 @@
-from slides import Lecture, Slide, TitleSlide, Bullet, PRE, URL, Image, SubBullet, cgi
+from slides import Lecture, Slide, Bullet, PRE, Image, SubBullet, cgi
 from pygments.lexers import get_lexer_by_name
 from pygments.formatters import get_formatter_by_name
@@ -70 +70 @@
 Slide = MySlide
 
+class TitleSlide(Slide):
+    def toHTML(self):
+        title = '<h1>%s</h1>' % cgi.escape(self.title)
+        bullets = []
+        for bullet in self.bullets:
+            bullets.append(bullet.toHTML())
+        return "<div style='margin: auto; width: 50%;'>" + title + self.start + "\n".join(bullets) + self.end + "</div>"
+
+class BulletlessSlide(Slide):
+    start = "<ul style='list-style-type: none;'>\n"
+    end = "</ul>\n"
+
+class BulletlessTitleSlide(TitleSlide):
+    start = "<ul style='list-style-type: none;'>\n"
+    end = "</ul>\n"
+
+class URL(object):
+    """A URL."""
+    def __init__(self, desc, url):
+        self.url = url
+        self.desc = desc
+
+    def toHTML(self):
+        return '<a href="%s">%s</a>' % (self.url, self.desc)
+
 l = MyLecture(
-    "Everything You Didn't Want to Known About Python Objects",
-    TitleSlide("Everything You Didn't Want to Known About Python Objects",
+    "Everything You Didn't Want to Know about Python Objects",
+    BulletlessTitleSlide("Everything You Didn't Want to Know about Python Objects",
         Bullet("in which I chronicle my recent findings in the depths of Object/object.c"),
     ),
@@ -82 +107 @@
             >>> type(Old), type(Old())
             (<type 'classobj'>, <type 'instance'>)
+            >>> Old.__class__
+            Traceback (most recent call last):
+              File "<stdin>", line 1, in <module>
+            AttributeError: class Old has no attribute '__class__'
+            >>> Old().__class__
+            <class util.Old at 0xb7d4e62c>
             """)),
         Bullet("New Style:", PYCON("""
@@ -89 +120 @@
             >>> type(New), type(New())
             (<type 'type'>, <class '__main__.New'>)
+            >>> New.__class__
+            <type 'type'>
+            >>> New().__class__
+            <class 'util.New'>
             """)),
+        Bullet("Old + __metaclass__ == New"),
     ),
     Slide("Gambolling With Slots",
+        Bullet("Adding slots:", PYCON("""
+            >>> class FooBar(object):
+            ...   def __str__(self):
+            ...     return "foobar"
+            ...
+            >>>   def __unicode__(self):
+            ...     return unicode("foobar")
+            ...
+            >>> str(FuBar), str(FuBar())
+            ("<class 'util.FuBar'>", 'fubar')
+            >>> unicode(FuBar)
+            Traceback (most recent call last):
+              File "<stdin>", line 1, in <module>
+            TypeError: unbound method __unicode__() must be called with FuBar instance as first argument (got nothing instead)
+            >>> unicode(Uni())
+            u'fubar'
+        """)),
+        Bullet("Same thing happens with old-style classes.")
+    ),
+    BulletlessSlide("object.c",
+        Bullet(Image("tabs.png")),
     ),
     Slide("Strings",
@@ -111 +168 @@
         """)),
         Bullet("Single characters and empty string held in permament cache (Objects/stringobject.c)."),
-        Bullet("Constants strings of size <= 20 cache by parser (TODO: check)."),
+        Bullet("Constants strings of size <= 20 interned by parser."),
         Bullet("PyString_InternInPlace (PyUnicode_InternInPlace in 3.0) results in strings being stored in internal dictionary.",
             SubBullet(
@@ -184 +241 @@
         Bullet("Perhaps just use numpy?"),
     ),
-    Slide("PyObject C API",
-        Bullet("List of methods unchanged between 2.5 and 2.6"),
-    ),
-    Slide("object.c",
-        Bullet(Image("tabs.png")),
-    ),
-    Slide("New Python Documents - ZOMG!",
-        Bullet("Interactive search -- in static HTML."),
-        Bullet("_static/searchindex.json"),
-        Bullet(URL("file:///home/simon/LocalProjects/PythonSpint/trunk/Doc/build/html/index.html")),
+    Slide("C API Documentation",
+        Bullet("PyObject API:",
+            SubBullet(
+                Bullet("List of methods unchanged between 2.5, 2.6 and 3.0"),
+            ),
+        ),
+        Bullet("New documentation!",
+            SubBullet(
+                Bullet("Interactive search -- in static HTML"),
+                Bullet("JSON index"),
+                Bullet(URL("2.6 Docs","file:///home/simon/LocalProjects/PythonSpint/trunk/Doc/build/html/index.html")),
+            ),
+        ),
     ),
 )