trunk - adding a py3util module that will normalize as many differences between this branch and the python3 branch as it can. First it includes a py3print call who's signature matches that of print in python3. Also removed a few byte strings of the form b''

1 files changed, 3 insertions, 3 deletions

diff --git a/cherrypy/lib/covercp.py b/cherrypy/lib/covercp.py
index 64bf23bc..aa6d9904 100644
--- a/cherrypy/lib/covercp.py
+++ b/cherrypy/lib/covercp.py
@@ -185,7 +185,7 @@ def _percent(statements, missing):
 def _show_branch(root, base, path, pct=0, showpct=False, exclude=""):
     
     # Show the directory name and any of our children
-    dirs = [k for k, v in root.iteritems() if v]
+    dirs = [k for k, v in root.items() if v]
     dirs.sort()
     for name in dirs:
         newpath = os.path.join(path, name)
@@ -202,7 +202,7 @@ def _show_branch(root, base, path, pct=0, showpct=False, exclude=""):
     # Now list the files
     if path.lower().startswith(base):
         relpath = path[len(base):]
-        files = [k for k, v in root.iteritems() if not v]
+        files = [k for k, v in root.items() if not v]
         files.sort()
         for name in files:
             newpath = os.path.join(path, name)
@@ -252,7 +252,7 @@ def get_tree(base, exclude):
     """Return covered module names as a nested dict."""
     tree = {}
     coverage.get_ready()
-    runs = coverage.cexecuted.keys()
+    runs = list(coverage.cexecuted.keys())
     if runs:
         for path in runs:
             if not _skip_file(path, exclude) and not os.path.isdir(path):