Merge lp:~mbp/kanban/718564-edge into lp:kanban

[Martin Pool]

It turns out my previous branch didn't catch the other occurrence, and the way it did the first part was over-complicated. Take 2.

[Jamu Kakar (jkakar)]

[1]

- get_person_assigned_bugs)
+ get_person_assigned_bugs,
+ SERVICE_ROOT)

Would you mind putting the new import on the same line as
get_person_assigned_bugs to match the existing formatting convention,
please?

[2]

 from launchpadlib.launchpad import Launchpad, EDGE_SERVICE_ROOT

The existing EDGE_SERVICE_ROOT import is no longer used. Can you
please remove it?

When you merge, can you please write a merge commit message using the
following format. You can see examples of it in the log for trunk.

"""
Merged $branch-name [r=$reviewer] [f=$bug-number]

$changeset-description
"""

Thanks for cleaning this up, +1!

review: Approve

[Martin Pool (mbp)]

Thanks

=== modified file 'kanban/commands.py'
--- kanban/commands.py	2011-02-05 23:24:53 +0000
+++ kanban/commands.py	2011-02-16 00:59:52 +0000
@@ -3,12 +3,13 @@
 from bzrlib.commands import Command
 from bzrlib.option import Option
 
-from launchpadlib.launchpad import Launchpad, EDGE_SERVICE_ROOT
+from launchpadlib.launchpad import Launchpad
 
 from kanban.html import generate_html, generate_roadmap_html
 from kanban.launchpad import (
     get_config_path, get_cache_path, get_launchpad, get_milestone_bugs,
-    get_person_assigned_bugs)
+    get_person_assigned_bugs,
+    SERVICE_ROOT)
 from kanban.milestone import Milestone, compare_bugs
 from kanban.roadmap import load_roadmap
 
@@ -29,7 +30,7 @@
             raise RuntimeError(
                 "Credentials already exist at %s" % credentials_path)
         launchpad = Launchpad.get_token_and_login(
-            "kanban", EDGE_SERVICE_ROOT, get_cache_path())
+            "kanban", SERVICE_ROOT, get_cache_path())
         launchpad.credentials.save(open(credentials_path, "w"))
 
 

=== modified file 'kanban/launchpad.py'
--- kanban/launchpad.py	2011-02-14 09:04:27 +0000
+++ kanban/launchpad.py	2011-02-16 00:59:52 +0000
@@ -13,10 +13,8 @@
 from launchpadlib.credentials import Credentials
 from launchpadlib.launchpad import Launchpad, EDGE_SERVICE_ROOT
 
-try:
-    from launchpadlib.launchpad import LPNET_SERVICE_ROOT
-except ImportError:
-    LPNET_SERVICE_ROOT = EDGE_SERVICE_ROOT.replace(".edge", "")
+from launchpadlib.uris import LPNET_SERVICE_ROOT
+SERVICE_ROOT = LPNET_SERVICE_ROOT
 
 from kanban.milestone import Bug