Launchpad itself

Merge lp:~maxb/launchpad/pymig-remove-lsprof into lp:~launchpad-committers/launchpad/ztk-2.5

  1. pymig-remove-lsprof
  2. Merge into ztk-2.5
Proposed by Max Bowsher
Status: Merged
Approved by: Max Bowsher
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~maxb/launchpad/pymig-remove-lsprof
Merge into: lp:~launchpad-committers/launchpad/ztk-2.5
Diff against target: 75 lines
4 files modified
lib/canonical/launchpad/doc/profiling.txt (+5/-5)
lib/lp/services/scripts/doc/profile.txt (+2/-2)
sourcecode/Makefile (+1/-1)
utilities/sourcedeps.conf (+0/-1)
To merge this branch: bzr merge lp:~maxb/launchpad/pymig-remove-lsprof
Reviewer Review Type Date Requested Status
Guilherme Salgado (community) Approve
Review via email: mp+14091@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Max Bowsher (maxb) wrote :

lsprof is included in Python 2.5+

Barry began to remove it from the python-migration branch by deleting the lib/_lsprof.so symlink - here's a branch to finish the job.

NB: I've verified that the changes between Python 2.4 pstats and our pstats2 are present in Python 2.5's pstats.

Revision history for this message
Guilherme Salgado (salgado) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed symlink 'lib/cProfile.py'
2=== target was u'../sourcecode/lsprof/Lib/cProfile.py'
3=== modified file 'lib/canonical/launchpad/doc/profiling.txt'
4--- lib/canonical/launchpad/doc/profiling.txt 2009-06-02 08:20:49 +0000
5+++ lib/canonical/launchpad/doc/profiling.txt 2009-10-28 15:55:23 +0000
6@@ -57,8 +57,8 @@
7 Once the layer finishes, it saves the profile data in the requested file.
8
9 >>> PageTestLayer.tearDown()
10- >>> import pstats2
11- >>> stats = pstats2.Stats(pagetests_profile)
12+ >>> import pstats
13+ >>> stats = pstats.Stats(pagetests_profile)
14 >>> os.remove(pagetests_profile)
15
16 When the environment isn't set, no profile is created.
17@@ -162,10 +162,10 @@
18 >>> profiling_oops_id == logged_oops.id
19 True
20
21-These profile can be loaded using the pstats2 module.
22+These profile can be loaded using the pstats module.
23
24- >>> import pstats2
25- >>> stats = pstats2.Stats(
26+ >>> import pstats
27+ >>> stats = pstats.Stats(
28 ... os.path.join(profile_dir, os.listdir(profile_dir)[0]))
29
30 Making another request will create another profile.
31
32=== modified file 'lib/lp/services/scripts/doc/profile.txt'
33--- lib/lp/services/scripts/doc/profile.txt 2009-05-07 18:21:36 +0000
34+++ lib/lp/services/scripts/doc/profile.txt 2009-10-28 15:55:23 +0000
35@@ -5,7 +5,7 @@
36
37 >>> import os
38 >>> import tempfile
39- >>> import pstats2
40+ >>> import pstats
41
42 >>> profile_dir = tempfile.mkdtemp(prefix='profile')
43 >>> from lp.services.scripts.base import LaunchpadScript
44@@ -23,4 +23,4 @@
45 ... 'test-script.py', '--profile', profile_file])
46
47 >>> script.run()
48- >>> stats = pstats2.Stats(profile_file)
49+ >>> stats = pstats.Stats(profile_file)
50
51=== removed symlink 'lib/pstats2.py'
52=== target was u'../sourcecode/lsprof/Lib/pstats2.py'
53=== modified file 'sourcecode/Makefile'
54--- sourcecode/Makefile 2009-10-13 14:38:07 +0000
55+++ sourcecode/Makefile 2009-10-28 15:55:23 +0000
56@@ -4,7 +4,7 @@
57 # the ones we test. If we fix them all to have EITHER a good makefile
58 # (build and check targets work), or no makefile we can reenable auto
59 # detection.
60-build_dirs:=cscvs dulwich lazr-js lsprof pygettextpo pygpgme twisted
61+build_dirs:=cscvs dulwich lazr-js pygettextpo pygpgme twisted
62 test_dirs:=cscvs pygettextpo twisted
63
64 TEST_ENV_VARS = \
65
66=== modified file 'utilities/sourcedeps.conf'
67--- utilities/sourcedeps.conf 2009-08-17 19:16:23 +0000
68+++ utilities/sourcedeps.conf 2009-10-28 15:55:23 +0000
69@@ -16,6 +16,5 @@
70 lpreview=lp:~launchpad-pqm/bzr-lpreview/devel/
71 pygettextpo=lp:~launchpad/pygettextpo/trunk/
72 old_xmlplus=lp:~launchpad/dtdparser/trunk/
73-lsprof=lp:~launchpad/lsprof/trunk/
74 canonical-identity-provider=lp:~launchpad-pqm/canonical-identity-provider/trunk/=optional
75 shipit=lp:~launchpad-pqm/shipit/trunk/=optional

Subscribers

People subscribed via source and target branches

to all changes: