Ubuntu Friendly

Merge lp:~cr3/ubuntu-friendly/lazr_workaround into lp:ubuntu-friendly

  1. lazr_workaround
  2. Merge into trunk
Proposed by Marc Tardif
Status: Merged
Approved by: Nicola Heald
Approved revision: 100
Merged at revision: 100
Proposed branch: lp:~cr3/ubuntu-friendly/lazr_workaround
Merge into: lp:ubuntu-friendly
Diff against target: 31 lines (+13/-0)
2 files modified
apps/lp.py (+6/-0)
apps/results/api.py (+7/-0)
To merge this branch: bzr merge lp:~cr3/ubuntu-friendly/lazr_workaround
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+79179@code.launchpad.net
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 'apps/lp.py'
2--- apps/lp.py 2011-08-31 16:54:25 +0000
3+++ apps/lp.py 2011-10-12 20:53:26 +0000
4@@ -1,3 +1,9 @@
5+# Make launchpadlib happy
6+try:
7+ import lazr.restful
8+except ImportError:
9+ pass
10+
11 from launchpadlib.launchpad import Launchpad
12 LP_ROOT = "http://91.189.93.82/+api/"
13 lp = Launchpad.login_with('Launchpad Results', LP_ROOT)
14
15=== modified file 'apps/results/api.py'
16--- apps/results/api.py 2011-10-11 16:36:48 +0000
17+++ apps/results/api.py 2011-10-12 20:53:26 +0000
18@@ -546,6 +546,13 @@
19 def __init__(self, release, age=2):
20 self.release = release
21 self.age = age
22+
23+ # Make launchpadlib happy
24+ try:
25+ import lazr.restful
26+ except ImportError:
27+ pass
28+
29 from launchpadlib.launchpad import Launchpad
30 self.api = Launchpad.login_anonymously(
31 'Launchpad Results', settings.LP_ROOT)

Subscribers

People subscribed via source and target branches