mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-26 21:07:30 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
88 lines
3.2 KiB
Diff
88 lines
3.2 KiB
Diff
diff --git a/pycallgraph/config.py b/pycallgraph/config.py
|
|
index 5911fef..e3492c1 100755
|
|
--- a/pycallgraph/config.py
|
|
+++ b/pycallgraph/config.py
|
|
@@ -34,7 +34,7 @@ class Config(object):
|
|
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 kwargs.items()]
|
|
|
|
self.create_parser()
|
|
|
|
diff --git a/pycallgraph/output/graphviz.py b/pycallgraph/output/graphviz.py
|
|
index 6f10049..d130d65 100644
|
|
--- a/pycallgraph/output/graphviz.py
|
|
+++ b/pycallgraph/output/graphviz.py
|
|
@@ -148,7 +148,7 @@ class GraphvizOutput(Output):
|
|
|
|
def attrs_from_dict(self, d):
|
|
output = []
|
|
- for attr, val in d.iteritems():
|
|
+ for attr, val in d.items():
|
|
output.append('%s = "%s"' % (attr, val))
|
|
return ', '.join(output)
|
|
|
|
@@ -164,7 +164,7 @@ class GraphvizOutput(Output):
|
|
|
|
def generate_attributes(self):
|
|
output = []
|
|
- for section, attrs in self.graph_attributes.iteritems():
|
|
+ for section, attrs in self.graph_attributes.items():
|
|
output.append('{} [ {} ];'.format(
|
|
section, self.attrs_from_dict(attrs),
|
|
))
|
|
diff --git a/pycallgraph/output/output.py b/pycallgraph/output/output.py
|
|
index 9660d58..48eef49 100644
|
|
--- a/pycallgraph/output/output.py
|
|
+++ b/pycallgraph/output/output.py
|
|
@@ -16,14 +16,14 @@ class Output(object):
|
|
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 kwargs.items()]
|
|
|
|
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 config.__dict__.items():
|
|
if hasattr(self, k) and callable(getattr(self, k)):
|
|
continue
|
|
setattr(self, k, v)
|
|
diff --git a/pycallgraph/tracer.py b/pycallgraph/tracer.py
|
|
index 17e9286..74a1477 100644
|
|
--- a/pycallgraph/tracer.py
|
|
+++ b/pycallgraph/tracer.py
|
|
@@ -297,7 +297,7 @@ class TraceProcessor(Thread):
|
|
grp = defaultdict(list)
|
|
for node in self.nodes():
|
|
grp[self.group(node.name)].append(node)
|
|
- for g in grp.iteritems():
|
|
+ for g in grp.items():
|
|
yield g
|
|
|
|
def stat_group_from_func(self, func, calls):
|
|
@@ -315,14 +315,14 @@ class TraceProcessor(Thread):
|
|
return stat_group
|
|
|
|
def nodes(self):
|
|
- for func, calls in self.func_count.iteritems():
|
|
+ for func, calls in self.func_count.items():
|
|
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 self.call_dict.items():
|
|
if not src_func:
|
|
continue
|
|
- for dst_func, calls in dests.iteritems():
|
|
+ for dst_func, calls in dests.items():
|
|
edge = self.stat_group_from_func(dst_func, calls)
|
|
edge.src_func = src_func
|
|
edge.dst_func = dst_func
|