Merge lp:~sil2100/ubuntu-archive-tools/plus-sign-review into lp:ubuntu-archive-tools

[Łukasz Zemczak]

Stop urlencoding source package name in sru-review when trying to access the debdiff as it makes it impossible to review packages with + in the name.

Do we really need to urlencode the source package name? In the current state it just makes the script not be able to access the debdiff, e.g.:
http://launchpadlibrarian.net/330880566/gtk+2.0_2.24.30-1ubuntu1.16.04.1_2.24.30-1ubuntu1.16.04.2.diff.gz

With quote() being used, the regexp cannot find the link in the queue webpage contents as the + sign is urlencoded. I wonder why this was added in the first place? Did something change in how links to the librarian are used?

[lp:~sil2100/ubuntu-archive-tools/plus-sign-review]

1115. By Łukasz Zemczak on 2017-08-02

Remove whitespace.

[Colin Watson (cjwatson)]

FWIW, the thing that changed was https://code.launchpad.net/~wgrant/launchpad/bug-677270/+merge/279974. Strictly speaking, to match that you ought to use quote(sourcepkg, safe='/~+'), but it makes no difference since there are no longer any characters that are legal in source package names and that are escaped in librarian URLs.

=== modified file 'sru-review'
--- sru-review	2017-06-30 15:21:47 +0000
+++ sru-review	2017-08-02 14:40:44 +0000
@@ -37,10 +37,9 @@
 import sys
 import tempfile
 try:
-    from urllib.parse import quote
     from urllib.request import urlopen, urlretrieve
 except ImportError:
-    from urllib import quote, urlopen, urlretrieve
+    from urllib import urlopen, urlretrieve
 import webbrowser
 
 from launchpadlib.launchpad import Launchpad
@@ -158,7 +157,7 @@
         debdiff_re = re.compile(
             'href="(http://launchpadlibrarian.net/'
             '\d+/%s_[^"_]+_[^_"]+\.diff\.gz)">\s*diff from' %
-            re.escape(quote(sourcepkg)))
+            re.escape(sourcepkg))
 
         queue_html = urlopen(queue_url).read()
 
@@ -186,7 +185,7 @@
     '''
     changes_re = re.compile(
         'href="(https://launchpad.net/[^ "]+/%s_[^"]+_source.changes)"' %
-        re.escape(quote(sourcepkg)))
+        re.escape(sourcepkg))
     sourcepub_re = re.compile(
         'href="(\+sourcepub/\d+/\+listing-archive-extra)"')
     #debdiff_re = re.compile(