Merge lp:~cjohnston/summit/886933-lp-common into lp:summit

Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 431
Merged at revision: 441
Proposed branch: lp:~cjohnston/summit/886933-lp-common
Merge into: lp:summit
Diff against target: 39 lines (+3/-3)
3 files modified
summit/schedule/management/commands/update-openids.py (+1/-1)
summit/schedule/models/summitmodel.py (+1/-1)
summit/schedule/tests.py (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/summit/886933-lp-common
Reviewer Review Type Date Requested Status
Summit Hackers Pending
Review via email: mp+118987@code.launchpad.net

Commit message

Moves LP stuff to the common app

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=== renamed file 'summit/schedule/launchpad.py' => 'summit/common/launchpad.py'
2=== modified file 'summit/schedule/management/commands/update-openids.py'
3--- summit/schedule/management/commands/update-openids.py 2012-02-19 21:40:16 +0000
4+++ summit/schedule/management/commands/update-openids.py 2012-08-09 16:06:24 +0000
5@@ -3,7 +3,7 @@
6 from django.core.management.base import BaseCommand, CommandError
7 from optparse import make_option
8
9-from schedule import launchpad
10+from summit.common import launchpad
11 from django.contrib.auth.models import User
12
13
14
15=== modified file 'summit/schedule/models/summitmodel.py'
16--- summit/schedule/models/summitmodel.py 2012-08-02 14:41:44 +0000
17+++ summit/schedule/models/summitmodel.py 2012-08-09 16:06:24 +0000
18@@ -38,7 +38,7 @@
19 from django.core.urlresolvers import reverse
20
21 from summit.schedule.fields import NameField
22-from summit.schedule import launchpad
23+from summit.common import launchpad
24
25 __all__ = (
26 'Summit',
27
28=== modified file 'summit/schedule/tests.py'
29--- summit/schedule/tests.py 2012-08-02 14:41:44 +0000
30+++ summit/schedule/tests.py 2012-08-09 16:06:24 +0000
31@@ -36,7 +36,7 @@
32
33 from summit.schedule.models import *
34 from summit.schedule.render import Schedule
35-from summit.schedule import launchpad
36+from summit.common import launchpad
37
38 # Monkey-patch our NameField into the types of fields that the factory
39 # understands. This is simpler than trying to subclass the Mommy

Subscribers

People subscribed via source and target branches