Fix a demo.

Demo/comparisons/sortingtest.py

@@ -24,7 +24,6 @@
 # - Handles blank input lines correctly
 
 import re
-import string
 import sys
 
 def main():
@@ -32,18 +31,13 @@ def main():
     def makekey(item, prog=prog):
         match = prog.match(item)
         if match:
-            var, num = match.group(1, 2)
+            var, num = match.groups()
-            return string.atoi(num), var
+            return int(num), var
         else:
             # Bad input -- pretend it's a var with value 0
             return 0, item
-    while 1:
+    for line in sys.stdin:
-        line = sys.stdin.readline()
+        items = sorted(makekey(item) for item in line.split())
-        if not line:
-            break
-        items = line.split()
-        items = map(makekey, items)
-        items.sort()
         for num, var in items:
             print "%s=%s" % (var, num),
         print