Merge lp:~parthm/bzr/trivial-doc-followup-549310-mandatory-whoami into lp:bzr

Proposed by Parth Malwankar on 2010-05-07
Status: Merged
Approved by: Robert Collins on 2010-05-07
Approved revision: 5198
Merged at revision: 5217
Proposed branch: lp:~parthm/bzr/trivial-doc-followup-549310-mandatory-whoami
Merge into: lp:bzr
Diff against target: 22 lines (+2/-3)
1 file modified
bzrlib/config.py (+2/-3)
To merge this branch: bzr merge lp:~parthm/bzr/trivial-doc-followup-549310-mandatory-whoami
Reviewer Review Type Date Requested Status
Vincent Ladeuil 2010-05-07 Approve on 2010-05-07
Review via email: mp+24877@code.launchpad.net

Commit Message

(parthm) trivial docstring fix to indicate when errors.NoWhoami is raised.

Description of the Change

Yesterday, on IRC vila noticed that some docstrings were out of date for the patch
https://code.launchpad.net/~parthm/bzr/549310-mandatory-whoami/+merge/24244

This is a trivial docstring update patch to fix that.

To post a comment you must log in.
Vincent Ladeuil (vila) wrote :

Thanks !

review: Approve
Robert Collins (lifeless) wrote :

rather than 'if none is found' perhaps 'if no username can be found' - a little clearer.

Parth Malwankar (parthm) wrote :

> rather than 'if none is found' perhaps 'if no username can be found' - a
> little clearer.

Done. Thanks.

5199. By Parth Malwankar on 2010-05-07

trivial clarification in docstring.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/config.py'
2--- bzrlib/config.py 2010-04-28 04:52:16 +0000
3+++ bzrlib/config.py 2010-05-07 06:40:50 +0000
4@@ -260,8 +260,7 @@
5 $BZR_EMAIL can be set to override this, then
6 the concrete policy type is checked, and finally
7 $EMAIL is examined.
8- If none is found, a reasonable default is (hopefully)
9- created.
10+ If no username can be found, errors.NoWhoami exception is raised.
11
12 TODO: Check it's reasonably well-formed.
13 """
14@@ -280,7 +279,7 @@
15 raise errors.NoWhoami()
16
17 def ensure_username(self):
18- """Raise BzrCommandError if username is not set.
19+ """Raise errors.NoWhoami if username is not set.
20
21 This method relies on the username() function raising the error.
22 """