Merged revisions 75358 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75358 | georg.brandl | 2009-10-11 17:06:44 +0200 (So, 11 Okt 2009) | 1 line

  Overhaul of Demo/xml.
........

1 files changed, 16 insertions, 10 deletions

diff --git a/Demo/xml/elem_count.py b/Demo/xml/elem_count.py
index e083e64..99d6ca9 100644
--- a/Demo/xml/elem_count.py
+++ b/Demo/xml/elem_count.py
@@ -1,4 +1,10 @@
+"""
+A simple demo that reads in an XML document and displays the number of
+elements and attributes as well as a tally of elements and attributes by name.
+"""
+
 import sys
+from collections import defaultdict
 
 from xml.sax import make_parser, handler
 
@@ -7,16 +13,16 @@ class FancyCounter(handler.ContentHandler):
     def __init__(self):
         self._elems = 0
         self._attrs = 0
-        self._elem_types = {}
-        self._attr_types = {}
+        self._elem_types = defaultdict(int)
+        self._attr_types = defaultdict(int)
 
     def startElement(self, name, attrs):
-        self._elems = self._elems + 1
-        self._attrs = self._attrs + len(attrs)
-        self._elem_types[name] = self._elem_types.get(name, 0) + 1
+        self._elems += 1
+        self._attrs += len(attrs)
+        self._elem_types[name] += 1
 
         for name in attrs.keys():
-            self._attr_types[name] = self._attr_types.get(name, 0) + 1
+            self._attr_types[name] += 1
 
     def endDocument(self):
         print("There were", self._elems, "elements.")
@@ -30,7 +36,7 @@ class FancyCounter(handler.ContentHandler):
         for pair in  self._attr_types.items():
             print("%20s %d" % pair)
 
-
-parser = make_parser()
-parser.setContentHandler(FancyCounter())
-parser.parse(sys.argv[1])
+if __name__ == '__main__':
+    parser = make_parser()
+    parser.setContentHandler(FancyCounter())
+    parser.parse(sys.argv[1])