Summit

Merge lp:~james-w/summit/no-edge into lp:summit

  1. no-edge
  2. Merge into trunk
Proposed by James Westby
Status: Merged
Approved by: Michael Hall
Approved revision: 91
Merged at revision: 96
Proposed branch: lp:~james-w/summit/no-edge
Merge into: lp:summit
Diff against target: 25 lines (+2/-2)
2 files modified
summit/schedule/management/commands/trackfix.py (+1/-1)
summit/schedule/models/summitmodel.py (+1/-1)
To merge this branch: bzr merge lp:~james-w/summit/no-edge
Reviewer Review Type Date Requested Status
Summit Hackers Pending
Review via email: mp+59526@code.launchpad.net

Description of the change

Don't use edge as it is unneeded and deprecated.

Thanks,

James

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/management/commands/trackfix.py'
2--- summit/schedule/management/commands/trackfix.py 2011-04-28 14:22:03 +0000
3+++ summit/schedule/management/commands/trackfix.py 2011-04-29 16:07:26 +0000
4@@ -48,7 +48,7 @@
5 for track in tracks:
6 if o_str.startswith(track.slug):
7 print "%s is now part of %s" % (o_str, track)
8- o.tracks = track
9+ o.tracks.add(track)
10 o.save()
11 break
12 if o.tracks.all().count() < 1:
13
14=== modified file 'summit/schedule/models/summitmodel.py'
15--- summit/schedule/models/summitmodel.py 2010-09-20 23:21:45 +0000
16+++ summit/schedule/models/summitmodel.py 2011-04-29 16:07:26 +0000
17@@ -158,7 +158,7 @@
18
19 def update_from_launchpad(self):
20 """Update from Launchpad data."""
21- url = ("https://edge.launchpad.net/sprints/%s/+temp-meeting-export"
22+ url = ("https://launchpad.net/sprints/%s/+temp-meeting-export"
23 % self.name)
24 export = urllib2.urlopen(url)
25 tree = ElementTree.parse(export)

Subscribers

People subscribed via source and target branches