Merge lp:~mbp/udd/819910-service-root into lp:udd

[Martin Pool]

Use the root url expected by the Launchpad session object, to avoid httperrors.

I haven't yet put this through a whole run, but it does let me manually run the code from inside file_mp etc.

[Robert Collins (lifeless)]

very similar to code I put into hydrazine. Looks fine to me.

[lp:~mbp/udd/819910-service-root]

505. By Martin Pool on 2011-08-17

Use lp's branches.getByUrl rather than url hacking (thanks jam)

[John A Meinel (jameinel)]

I don't think this applies anymore:
# Strip off the scheme, and hostname.

And the syntax is ugly (having to lp_call(lp.branches.getByUrl the lp api seems a bit redundant)

However, it all looks correct and better than before.

review: Approve

[lp:~mbp/udd/819910-service-root]

506. By Martin Pool on 2011-08-17

Remove dead comment

=== modified file 'import_package.py'
--- import_package.py	2011-07-12 22:55:49 +0000
+++ import_package.py	2011-08-17 10:23:30 +0000
@@ -499,11 +499,11 @@
 
 
 def file_mp(distro, release, pocket, name, bstore, lp_side_branch_path):
-    lp_url = lpapi.SERVICE_ROOT \
-              + lp_side_branch_path[lp_side_branch_path.index("~"):]
-    lp_branch = lpapi.lp_call(lp.load, lp_url)
+    lp_branch = lpapi.lp_call(lp.branches.getByUrl,
+        url=lp_side_branch_path)
     target_branch_url = bstore._branch_url(distro, release, pocket)
-    target_lp_branch = lpapi.lp_call(lp.load, target_branch_url)
+    target_lp_branch = lpapi.lp_call(lp.branches.getByUrl,
+        url=target_branch_url)
     # It would be great to notify the uploader and pusher of the merge
     # proposal, but let's start with ~ubuntu-dev.
     ubuntu_dev = lpapi.lp_call(operator.getitem, lp.people, 'ubuntu-dev')