Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r60356:be09cec779a0
Date: 2013-01-22 18:28 -0800
http://bitbucket.org/pypy/pypy/changeset/be09cec779a0/
Log: o __builtin__ -> builtins o quick hack to _lsprof objects'
__module__ so the cprofile tests format more similarly to cpython
diff --git a/pypy/module/_lsprof/interp_lsprof.py
b/pypy/module/_lsprof/interp_lsprof.py
--- a/pypy/module/_lsprof/interp_lsprof.py
+++ b/pypy/module/_lsprof/interp_lsprof.py
@@ -62,7 +62,7 @@
return self.frame
W_StatsEntry.typedef = TypeDef(
- 'StatsEntry',
+ '_lsprof.StatsEntry',
code = GetSetProperty(W_StatsEntry.get_code),
callcount = interp_attrproperty('callcount', W_StatsEntry),
reccallcount = interp_attrproperty('reccallcount', W_StatsEntry),
@@ -89,7 +89,7 @@
return self.frame
W_StatsSubEntry.typedef = TypeDef(
- 'SubStatsEntry',
+ '_lsprof.SubStatsEntry',
code = GetSetProperty(W_StatsSubEntry.get_code),
callcount = interp_attrproperty('callcount', W_StatsSubEntry),
reccallcount = interp_attrproperty('reccallcount', W_StatsSubEntry),
@@ -210,7 +210,7 @@
module = ''
else:
module = space.str_w(w_func.w_module)
- if module == '__builtin__':
+ if module == 'builtins':
module = ''
else:
module += '.'
@@ -401,8 +401,7 @@
return space.wrap(p)
W_Profiler.typedef = TypeDef(
- 'Profiler',
- __module__ = '_lsprof',
+ '_lsprof.Profiler',
__new__ = interp2app(descr_new_profile),
enable = interp2app(W_Profiler.enable),
disable = interp2app(W_Profiler.disable),
diff --git a/pypy/module/_lsprof/test/test_cprofile.py
b/pypy/module/_lsprof/test/test_cprofile.py
--- a/pypy/module/_lsprof/test/test_cprofile.py
+++ b/pypy/module/_lsprof/test/test_cprofile.py
@@ -198,7 +198,7 @@
expected_output = {}
expected_output['print_stats'] = """\
- 126 function calls (106 primitive calls) in 1.000 seconds
+ 119 function calls (99 primitive calls) in 1.000 seconds
Ordered by: standard name
@@ -213,10 +213,10 @@
2 0.000 0.000 0.140 0.070 profilee.py:84(helper2_indirect)
8 0.312 0.039 0.400 0.050 profilee.py:88(helper2)
8 0.064 0.008 0.080 0.010 profilee.py:98(subhelper)
+ 1 0.000 0.000 1.000 1.000 {exec}
+ 12 0.000 0.000 0.012 0.001 {hasattr}
4 0.000 0.000 0.000 0.000 {method 'append' of 'list'
objects}
1 0.000 0.000 0.000 0.000 {method 'disable' of
'_lsprof.Profiler' objects}
- 12 0.000 0.000 0.012 0.001 {hasattr}
- 8 0.000 0.000 0.000 0.000 {range}
4 0.000 0.000 0.000 0.000 {sys.exc_info}
@@ -225,60 +225,59 @@
expected_output['print_callers'] = """\
Ordered by: standard name
-Function * was called by...
- * ncalls tottime cumtime
-<string>:1(<module>) * <-
-profilee.py:110(__getattr__) * <- 16 0.016 0.016
profilee.py:98(subhelper)
- * 12 0.012 0.012 {hasattr.*}
-profilee.py:25(testfunc) * <- 1 0.270 1.000
<string>:1(<module>)
-profilee.py:35(factorial) * <- 1 0.014 0.130
profilee.py:25(testfunc)
- * 20/3 0.130 0.147
profilee.py:35(factorial)
- * 2 0.006 0.040
profilee.py:84(helper2_indirect)
-profilee.py:48(mul) * <- 20 0.020 0.020
profilee.py:35(factorial)
-profilee.py:55(helper) * <- 2 0.040 0.600
profilee.py:25(testfunc)
-profilee.py:73(helper1) * <- 4 0.116 0.120
profilee.py:55(helper)
-profilee.py:84(helper2_indirect) *<- 2 0.000 0.140
profilee.py:55(helper)
-profilee.py:88(helper2) * <- 6 0.234 0.300
profilee.py:55(helper)
- * 2 0.078 0.100
profilee.py:84(helper2_indirect)
-profilee.py:98(subhelper) * <- 8 0.064 0.080
profilee.py:88(helper2)
-{.*append.*} * <- 4 0.000 0.000 profilee.py:73(helper1)
-{.*disable.*} * <-
-{hasattr.*} * <- 4 0.000 0.004 profilee.py:73(helper1)
- * 8 0.000 0.008 profilee.py:88(helper2)
-{range.*} * <- 8 0.000 0.000 profilee.py:98(subhelper)
-{sys.exc_info.*} * <- 4 0.000 0.000 profilee.py:73(helper1)
+Function was called by...
+ ncalls tottime cumtime
+<string>:1(<module>) <- 1 0.000 1.000
{exec}
+profilee.py:110(__getattr__) <- 16 0.016 0.016
profilee.py:98(subhelper)
+ 12 0.012 0.012
{hasattr}
+profilee.py:25(testfunc) <- 1 0.270 1.000
<string>:1(<module>)
+profilee.py:35(factorial) <- 1 0.014 0.130
profilee.py:25(testfunc)
+ 20/3 0.130 0.147
profilee.py:35(factorial)
+ 2 0.006 0.040
profilee.py:84(helper2_indirect)
+profilee.py:48(mul) <- 20 0.020 0.020
profilee.py:35(factorial)
+profilee.py:55(helper) <- 2 0.040 0.600
profilee.py:25(testfunc)
+profilee.py:73(helper1) <- 4 0.116 0.120
profilee.py:55(helper)
+profilee.py:84(helper2_indirect) <- 2 0.000 0.140
profilee.py:55(helper)
+profilee.py:88(helper2) <- 6 0.234 0.300
profilee.py:55(helper)
+ 2 0.078 0.100
profilee.py:84(helper2_indirect)
+profilee.py:98(subhelper) <- 8 0.064 0.080
profilee.py:88(helper2)
+{exec} <-
+{hasattr} <- 4 0.000 0.004
profilee.py:73(helper1)
+ 8 0.000 0.008
profilee.py:88(helper2)
+{method 'append' of 'list' objects} <- 4 0.000 0.000
profilee.py:73(helper1)
+{method 'disable' of '_lsprof.Profiler' objects} <-
+{sys.exc_info} <- 4 0.000 0.000
profilee.py:73(helper1)
"""
expected_output['print_callees'] = """\
Ordered by: standard name
-Function * called...
- * ncalls tottime cumtime
-<string>:1(<module>) * -> 1 0.270 1.000
profilee.py:25(testfunc)
-profilee.py:110(__getattr__) * ->
-profilee.py:25(testfunc) * -> 1 0.014 0.130
profilee.py:35(factorial)
- * 2 0.040 0.600
profilee.py:55(helper)
-profilee.py:35(factorial) * -> 20/3 0.130 0.147
profilee.py:35(factorial)
- * 20 0.020 0.020
profilee.py:48(mul)
-profilee.py:48(mul) * ->
-profilee.py:55(helper) * -> 4 0.116 0.120
profilee.py:73(helper1)
- * 2 0.000 0.140
profilee.py:84(helper2_indirect)
- * 6 0.234 0.300
profilee.py:88(helper2)
-\\(profilee.py:73(helper1)\\)\\? * .. 4 0.000 0.000
{.*append.*}
-\\(profilee.py:73(helper1)\\)\\? * .. 4 0.000 0.004
{.*hasattr.*}
- * 4 0.000 0.000
{sys.exc_info.*}
-profilee.py:84(helper2_indirect) * -> 2 0.006 0.040
profilee.py:35(factorial)
- * 2 0.078 0.100
profilee.py:88(helper2)
-profilee.py:88(helper2) * -> 8 0.064 0.080
profilee.py:98(subhelper)
- * 8 0.000 0.008 {hasattr.*}
-profilee.py:98(subhelper) * -> 16 0.016 0.016
profilee.py:110(__getattr__)
- * 8 0.000 0.000 {range.*}
-{.*append.*} * ->
-{.*disable.*} * ->
-{hasattr.*} * -> 12 0.012 0.012
profilee.py:110(__getattr__)
-{range.*} * ->
-{sys.exc_info.*} * ->
+Function called...
+ ncalls tottime cumtime
+<string>:1(<module>) -> 1 0.270 1.000
profilee.py:25(testfunc)
+profilee.py:110(__getattr__) ->
+profilee.py:25(testfunc) -> 1 0.014 0.130
profilee.py:35(factorial)
+ 2 0.040 0.600
profilee.py:55(helper)
+profilee.py:35(factorial) -> 20/3 0.130 0.147
profilee.py:35(factorial)
+ 20 0.020 0.020
profilee.py:48(mul)
+profilee.py:48(mul) ->
+profilee.py:55(helper) -> 4 0.116 0.120
profilee.py:73(helper1)
+ 2 0.000 0.140
profilee.py:84(helper2_indirect)
+ 6 0.234 0.300
profilee.py:88(helper2)
+profilee.py:73(helper1) -> 4 0.000 0.004
{hasattr}
+ 4 0.000 0.000
{method 'append' of 'list' objects}
+ 4 0.000 0.000
{sys.exc_info}
+profilee.py:84(helper2_indirect) -> 2 0.006 0.040
profilee.py:35(factorial)
+ 2 0.078 0.100
profilee.py:88(helper2)
+profilee.py:88(helper2) -> 8 0.064 0.080
profilee.py:98(subhelper)
+ 8 0.000 0.008
{hasattr}
+profilee.py:98(subhelper) -> 16 0.016 0.016
profilee.py:110(__getattr__)
+{exec} -> 1 0.000 1.000
<string>:1(<module>)
+{hasattr} -> 12 0.012 0.012
profilee.py:110(__getattr__)
+{method 'append' of 'list' objects} ->
+{method 'disable' of '_lsprof.Profiler' objects} ->
+{sys.exc_info} ->
"""
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
