Rev 5171: Fix canonical_url for new URL forms. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5171 [merge]
revision-id: pqm at pqm.ubuntu.com-20100422004534-nuqgl0mux4xw19kj
parent: pqm at pqm.ubuntu.com-20100421114839-4elxlyab2r06ryj3
parent: aaron at aaronbentley.com-20100421084615-17f4vlaby2mi79ep
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-04-22 01:45:34 +0100
message:
  Fix canonical_url for new URL forms.
modified:
  bzrlib/plugins/launchpad/lp_propose.py lp_submit.py-20100120065117-penrmqruf596pui6-1
=== modified file 'bzrlib/plugins/launchpad/lp_propose.py'
--- a/bzrlib/plugins/launchpad/lp_propose.py	2010-02-18 04:26:30 +0000
+++ b/bzrlib/plugins/launchpad/lp_propose.py	2010-04-21 08:46:15 +0000
@@ -15,6 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
+import urlparse
 import webbrowser
 
 from bzrlib import (
@@ -202,5 +203,9 @@
 
 def canonical_url(object):
     """Return the canonical URL for a branch."""
-    url = object.self_link.replace('https://api.', 'https://code.')
-    return url.replace('/beta/', '/')
+    scheme, netloc, path, params, query, fragment = urlparse.urlparse(
+        str(object.self_link))
+    path = '/'.join(path.split('/')[2:])
+    netloc = netloc.replace('api.', 'code.')
+    return urlparse.urlunparse((scheme, netloc, path, params, query,
+                                fragment))