update from Atlas

metaprog/oscon-schedule/schedule1.py

@@ -1,19 +1,26 @@
 """
 schedule1.py: traversing OSCON schedule data
 
+# BEGIN SCHEDULE1_DEMO
     >>> import shelve
-    >>> db = shelve.open(DB_NAME)
-    >>> if CONFERENCE not in db: load_db(db)
-    >>> event = db['event.33950']
-    >>> speaker = db['speaker.3471']
-    >>> speaker.name
+    >>> db = shelve.open(DB_NAME)  # <1>
+    >>> if CONFERENCE not in db:  # <2>
+    ...     load_db(db)  # <3>
+    ...
+    >>> speaker = db['speaker.3471']  # <4>
+    >>> type(speaker)  # <5>
+    <class 'schedule1.Record'>
+    >>> speaker.name  # <6>
     'Anna Martelli Ravenscroft'
     >>> speaker.twitter
     'annaraven'
-    >>> db.close()
+    >>> db.close()  # <7>
+
+# END SCHEDULE1_DEMO
 
 """
 
+# BEGIN SCHEDULE1
 import warnings
 
 import osconfeed
@@ -23,15 +30,18 @@ CONFERENCE = 'conference.115'
 
 
 class Record:
-    def __init__(self, mapping):
-        self.__dict__.update(mapping)
+    def __init__(self, **kwargs):
+        self.__dict__.update(kwargs)  # <1>
 
 
 def load_db(db):
-    raw_data = osconfeed.load()
+    raw_data = osconfeed.load()  # <2>
     warnings.warn('loading ' + DB_NAME)
-    for collection, rec_list in raw_data['Schedule'].items():
-        rec_type = collection[:-1]
-        for fields in rec_list:
-            key = '{}.{}'.format(rec_type, fields['serial'])
-            db[key] = Record(fields)
+    for collection, rec_list in raw_data['Schedule'].items():  # <3>
+        record_type = collection[:-1]  # <4>
+        for record in rec_list:
+            key = '{}.{}'.format(record_type, record['serial'])  # <5>
+            record['serial'] = key  # <6>
+            db[key] = Record(**record)  # <7>
+
+# END SCHEDULE1