2to3 fixes

examples/gephi/basic.py

@@ -34,7 +34,7 @@ def main():
 
     with PyCallGraph(output=gephi):
         person = Person()
-        for a in xrange(10):
+        for a in range(10):
             person.add_banana(Banana())
         person.eat_bananas()
 

examples/gephi/large.py

@@ -13,7 +13,12 @@ def main():
     gephi.output_file = 'large.gdf'
 
     with PyCallGraph(output=gephi):
-        from urllib2 import urlopen
+
+        try:
+            from urllib2 import urlopen
+        except ImportError:  # Python 3.x
+            from urllib.request import urlopen
+
         from xml.dom.minidom import parseString
         parseString(urlopen('http://w3.org/').read())
 

examples/graphviz/all.py

@@ -2,11 +2,16 @@
 '''
 Execute all pycallgraph examples in this directory.
 '''
+import sys
 from glob import glob
 
 
 examples = glob('*.py')
 examples.remove('all.py')
 for example in examples:
     print(example)
-    execfile(example)
+
+    if sys.version_info[0] < 3:
+        execfile(example)
+    else:
+        exec(open(example).read())

examples/graphviz/basic.py

@@ -34,7 +34,7 @@ def main():
 
     with PyCallGraph(output=graphviz):
         person = Person()
-        for a in xrange(10):
+        for a in range(10):
             person.add_banana(Banana())
         person.eat_bananas()
 

examples/graphviz/colors.py

@@ -56,7 +56,10 @@ def main():
     )
 
     pycallgraph.start()
-    import HTMLParser  # noqa
+    try:
+        import HTMLParser
+    except ImportError:  # Python 3.x
+        import html.parser  # noqa
     pycallgraph.stop()
 
     # Set the edge colour to black for all examples

examples/graphviz/example_with_submodules/example_with_submodules.py

@@ -1,5 +1,5 @@
-from submodule_one import SubmoduleOne
-from submodule_two import SubmoduleTwo
+from .submodule_one import SubmoduleOne
+from .submodule_two import SubmoduleTwo
 
 
 def main():

examples/graphviz/example_with_submodules/submodule_two.py

@@ -1,4 +1,4 @@
-from helpers import helper
+from .helpers import helper
 
 
 class SubmoduleTwo(object):

examples/graphviz/import.py

@@ -11,8 +11,8 @@
 def main():
     import_list = (
         'pickle',
-        'htmllib',
-        'urllib2',
+        'glob',
+        'datetime',
     )
     graphviz = GraphvizOutput()
     config = Config(include_stdlib=True)
@@ -23,5 +23,6 @@ def main():
             __import__(module)
 
 
+
 if __name__ == '__main__':
     main()

examples/graphviz/large.py

@@ -15,7 +15,12 @@ def main():
     config = Config(include_stdlib=True)
 
     with PyCallGraph(output=graphviz, config=config):
-        from urllib2 import urlopen
+
+        try:
+            from urllib2 import urlopen
+        except ImportError:  # Python 3.x
+            from urllib.request import urlopen
+
         from xml.dom.minidom import parseString
         parseString(urlopen('http://w3.org/').read())
 

examples/graphviz/recursive.py

@@ -17,7 +17,7 @@ def main():
     graphviz.output_file = 'recursive.png'
 
     with PyCallGraph(output=graphviz):
-        for a in xrange(1, 10):
+        for a in range(1, 10):
             factorial(a)
 
 if __name__ == '__main__':

pycallgraph/config.py

@@ -1,5 +1,6 @@
 import argparse
 import sys
+import six
 
 from .output import outputters
 from .globbing_filter import GlobbingFilter
@@ -38,7 +39,7 @@ def __init__(self, **kwargs):
         self.did_init = True
 
         # Update the defaults with anything from kwargs
-        [setattr(self, k, v) for k, v in kwargs.iteritems()]
+        [setattr(self, k, v) for k, v in six.iteritems(kwargs)]
 
         self.create_parser()
 

pycallgraph/output/graphviz.py

@@ -5,6 +5,8 @@
 import textwrap
 import subprocess as sub
 
+import six
+
 from ..metadata import __version__
 from ..exceptions import PyCallGraphException
 from ..color import Color
@@ -151,7 +153,7 @@ def generate(self):
 
     def attrs_from_dict(self, d):
         output = []
-        for attr, val in d.iteritems():
+        for attr, val in six.iteritems(d):
             output.append('%s = "%s"' % (attr, val))
         return ', '.join(output)
 
@@ -167,7 +169,7 @@ def edge(self, edge, attr):
 
     def generate_attributes(self):
         output = []
-        for section, attrs in self.graph_attributes.iteritems():
+        for section, attrs in six.iteritems(self.graph_attributes):
             output.append('{0} [ {1} ];'.format(
                 section, self.attrs_from_dict(attrs),
             ))

pycallgraph/output/output.py

@@ -1,5 +1,7 @@
 import re
 import os
+import six
+
 from distutils.spawn import find_executable
 
 from ..exceptions import PyCallGraphException
@@ -16,14 +18,14 @@ def __init__(self, **kwargs):
         self.edge_label_func = self.edge_label
 
         # Update the defaults with anything from kwargs
-        [setattr(self, k, v) for k, v in kwargs.iteritems()]
+        [setattr(self, k, v) for k, v in six.iteritems(kwargs)]
 
     def set_config(self, config):
         '''
         This is a quick hack to move the config variables set in Config into
         the output module config variables.
         '''
-        for k, v in config.__dict__.iteritems():
+        for k, v in six.iteritems(config.__dict__):
             if hasattr(self, k) and \
                     callable(getattr(self, k)):
                 continue

pycallgraph/tracer.py

@@ -7,6 +7,9 @@
 from distutils import sysconfig
 from collections import defaultdict
 from threading import Thread
+
+import six
+
 try:
     from Queue import Queue, Empty
 except ImportError:
@@ -294,7 +297,7 @@ def groups(self):
         grp = defaultdict(list)
         for node in self.nodes():
             grp[node.group].append(node)
-        for g in grp.iteritems():
+        for g in six.iteritems(grp):
             yield g
 
     def stat_group_from_func(self, func, calls):
@@ -312,14 +315,14 @@ def stat_group_from_func(self, func, calls):
         return stat_group
 
     def nodes(self):
-        for func, calls in self.func_count.iteritems():
+        for func, calls in six.iteritems(self.func_count):
             yield self.stat_group_from_func(func, calls)
 
     def edges(self):
-        for src_func, dests in self.call_dict.iteritems():
+        for src_func, dests in six.iteritems(self.call_dict):
             if not src_func:
                 continue
-            for dst_func, calls in dests.iteritems():
+            for dst_func, calls in six.iteritems(dests):
                 edge = self.stat_group_from_func(dst_func, calls)
                 edge.src_func = src_func
                 edge.dst_func = dst_func
@@ -372,4 +375,5 @@ def wrapper(*rest):
 
     return wrapper
 
+
 inspect.getmodule = simple_memoize(inspect.getmodule)

requirements/development.txt

@@ -3,3 +3,4 @@ pytest-pep8
 pytest-cov
 python-coveralls
 flake8
+six