Merge lp:~parthm/bzr/603461-invalidpattern-python25 into lp:bzr
Proposed by
Parth Malwankar
Status: | Merged |
---|---|
Approved by: | John A Meinel |
Approved revision: | no longer in the source branch. |
Merged at revision: | 5340 |
Proposed branch: | lp:~parthm/bzr/603461-invalidpattern-python25 |
Merge into: | lp:bzr |
Diff against target: |
102 lines (+15/-10) 7 files modified
bzrlib/errors.py (+3/-3) bzrlib/globbing.py (+3/-3) bzrlib/osutils.py (+1/-1) bzrlib/tests/blackbox/test_log.py (+1/-0) bzrlib/tests/test_errors.py (+5/-0) bzrlib/tests/test_globbing.py (+1/-1) bzrlib/tests/test_lazy_regex.py (+1/-2) |
To merge this branch: | bzr merge lp:~parthm/bzr/603461-invalidpattern-python25 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
bzr-core | Pending | ||
Review via email: mp+29587@code.launchpad.net |
Commit message
Rename errors.
Description of the change
=== Fixes Bug #603461 ===
This fixes the regression noted in bug #603461. InvalidPattern was using "message" as the name of its argument and this was causing problems on certain versions of Python (2.5 and 2.6.2). As noted elsewhere in errors.py: "'msg' is used instead of 'message' because python evolved and, in 2.6, forbids the use of 'message'."
This patch renames the argument to "msg" and also adds a test to bt.test_errors
To post a comment you must log in.
sent to pqm by email