Bazaar

Merge lp:~jameinel/bzr/2.0-string-exception-586926 into lp:bzr/2.0

  1. 2.0-string-exception-586926
  2. Merge into 2.0
Proposed by John A Meinel
Status: Merged
Merged at revision: 4751
Proposed branch: lp:~jameinel/bzr/2.0-string-exception-586926
Merge into: lp:bzr/2.0
Diff against target: 32 lines (+5/-2)
2 files modified
NEWS (+3/-0)
bzrlib/bundle/bundle_data.py (+2/-2)
To merge this branch: bzr merge lp:~jameinel/bzr/2.0-string-exception-586926
Reviewer Review Type Date Requested Status
Barry Warsaw Approve
Review via email: mp+26332@code.launchpad.net

Description of the change

We accidentally have a string exception as pointed out by Barry Warsaw, as pointed out by the debian guys.

This should fix it, and should get merged up to bzr.dev.

To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2010-05-20 21:23:47 +0000
3+++ NEWS 2010-05-28 18:08:30 +0000
4@@ -26,6 +26,9 @@
5 permissions as ``.bzr`` directory on a POSIX OS.
6 (Parth Malwankar, #262450)
7
8+* Raise ValueError instead of a string exception.
9+ (John Arbash Meinel, #586926)
10+
11 * Reduce peak memory by one copy of compressed text.
12 (John Arbash Meinel, #566940)
13
14
15=== modified file 'bzrlib/bundle/bundle_data.py'
16--- bzrlib/bundle/bundle_data.py 2009-05-06 05:36:28 +0000
17+++ bzrlib/bundle/bundle_data.py 2010-05-28 18:08:30 +0000
18@@ -1,4 +1,4 @@
19-# Copyright (C) 2006 Canonical Ltd
20+# Copyright (C) 2005-2010 Canonical Ltd
21 #
22 # This program is free software; you can redistribute it and/or modify
23 # it under the terms of the GNU General Public License as published by
24@@ -327,7 +327,7 @@
25 try:
26 name, value = info_item.split(':', 1)
27 except ValueError:
28- raise 'Value %r has no colon' % info_item
29+ raise ValueError('Value %r has no colon' % info_item)
30 if name == 'last-changed':
31 last_changed = value
32 elif name == 'executable':

Subscribers

People subscribed via source and target branches