Merge lp:~cjwatson/loggerhead/marshal-version into lp:loggerhead
Proposed by
Colin Watson
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | 516 |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | not available |
Proposed branch: | lp:~cjwatson/loggerhead/marshal-version |
Merge into: | lp:loggerhead |
Diff against target: |
24 lines (+5/-2) 1 file modified
loggerhead/changecache.py (+5/-2) |
To merge this branch: | bzr merge lp:~cjwatson/loggerhead/marshal-version |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tom Wardill (community) | Approve | ||
Review via email: mp+406291@code.launchpad.net |
Commit message
Make RevInfoDiskCache use a marshal version supported by Python 2.
Description of the change
Otherwise we run into trouble in the middle of an upgrade to Python 3, as marshal.dumps produces output that Python 2's marshal.loads can't read.
Since we now have some existing cached data unreadable by Python 2, I also made marshal.loads errors non-fatal and we just pretend we have no cache in such cases; this is OK because it's a cache.
To post a comment you must log in.