--- a/hgext/convert/cvsps.py	Sun Oct 06 17:59:15 2019 -0400
+++ b/hgext/convert/cvsps.py	Sun Oct 06 19:25:18 2019 -0400
@@ -470,7 +470,7 @@
 
             # find the branches starting from this revision
             branchpoints = set()
-            for branch, revision in branchmap.iteritems():
+            for branch, revision in pycompat.iteritems(branchmap):
                 revparts = tuple([int(i) for i in revision.split(b'.')])
                 if len(revparts) < 2:  # bad tags
                     continue