Merge lp:~jelmer/brz/segmentsurl into lp:brz

Proposed by Jelmer Vernooij
Status: Superseded
Proposed branch: lp:~jelmer/brz/segmentsurl
Merge into: lp:brz
Diff against target: 41 lines (+9/-1)
3 files modified
breezy/tests/test_urlutils.py (+2/-0)
breezy/urlutils.py (+4/-1)
doc/en/release-notes/brz-3.0.txt (+3/-0)
To merge this branch: bzr merge lp:~jelmer/brz/segmentsurl
Reviewer Review Type Date Requested Status
Breezy developers Pending
Review via email: mp+363278@code.launchpad.net

Description of the change

Raise better error when subsegments lack =.

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 'breezy/tests/test_urlutils.py'
2--- breezy/tests/test_urlutils.py 2018-11-23 03:06:01 +0000
3+++ breezy/tests/test_urlutils.py 2019-02-16 03:08:36 +0000
4@@ -599,6 +599,8 @@
5 self.assertEqual(("foo/base,key1=val1/other/elements",
6 {"key2": "val2"}), split_segment_parameters(
7 "foo/base,key1=val1/other/elements,key2=val2"))
8+ self.assertRaises(urlutils.InvalidURL, split_segment_parameters,
9+ "foo/base,key1")
10 # TODO: Check full URLs as well as relative references
11
12 def test_win32_strip_local_trailing_slash(self):
13
14=== modified file 'breezy/urlutils.py'
15--- breezy/urlutils.py 2018-11-12 01:41:38 +0000
16+++ breezy/urlutils.py 2019-02-16 03:08:36 +0000
17@@ -561,7 +561,10 @@
18 (base_url, subsegments) = split_segment_parameters_raw(url)
19 parameters = {}
20 for subsegment in subsegments:
21- (key, value) = subsegment.split("=", 1)
22+ try:
23+ (key, value) = subsegment.split("=", 1)
24+ except ValueError:
25+ raise InvalidURL(url, "missing = in subsegment")
26 if not isinstance(key, str):
27 raise TypeError(key)
28 if not isinstance(value, str):
29
30=== modified file 'doc/en/release-notes/brz-3.0.txt'
31--- doc/en/release-notes/brz-3.0.txt 2019-02-14 06:21:45 +0000
32+++ doc/en/release-notes/brz-3.0.txt 2019-02-16 03:08:36 +0000
33@@ -230,6 +230,9 @@
34 * Don't report .git files as unknown files.
35 (Jelmer Vernooij, Debian Bug #921240)
36
37+* Raise better error when path subsegments lack =.
38+ (Jelmer Vernooij, #891483)
39+
40 Documentation
41 *************
42

Subscribers

People subscribed via source and target branches