[Python-3000-checkins] r58279 - python/branches/py3k/Tools/scripts/byext.py

[guido.van.rossum]

Author: guido.van.rossum
Date: Fri Sep 28 00:39:12 2007
New Revision: 58279

Modified:
   python/branches/py3k/Tools/scripts/byext.py
Log:
Make byext.py really work.


Modified: python/branches/py3k/Tools/scripts/byext.py
==============================================================================
--- python/branches/py3k/Tools/scripts/byext.py	(original)
+++ python/branches/py3k/Tools/scripts/byext.py	Fri Sep 28 00:39:12 2007
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3.0
 
 """Show file statistics by extension."""
 
@@ -60,13 +60,13 @@
         data = f.read()
         f.close()
         self.addstats(ext, "bytes", len(data))
-        if '\0' in data:
+        if b'\0' in data:
             self.addstats(ext, "binary", 1)
             return
         if not data:
             self.addstats(ext, "empty", 1)
         #self.addstats(ext, "chars", len(data))
-        lines = data.splitlines()
+        lines = str(data, "latin-1").splitlines()
         self.addstats(ext, "lines", len(lines))
         del lines
         words = data.split()
@@ -77,14 +77,12 @@
         d[key] = d.get(key, 0) + n
 
     def report(self):
-        exts = self.stats.keys()
-        exts.sort()
+        exts = sorted(self.stats)
         # Get the column keys
         columns = {}
         for ext in exts:
             columns.update(self.stats[ext])
-        cols = columns.keys()
-        cols.sort()
+        cols = sorted(columns)
         colwidth = {}
         colwidth["ext"] = max([len(ext) for ext in exts])
         minwidth = 6