Merge lp://staging/~ogra/xdiagnose/py3port into lp://staging/xdiagnose
Proposed by
Oliver Grawert
Status: | Merged |
---|---|
Merged at revision: | 256 |
Proposed branch: | lp://staging/~ogra/xdiagnose/py3port |
Merge into: | lp://staging/xdiagnose |
Diff against target: |
1040 lines (+266/-182) 35 files modified
apport/apport-gpu-error-intel.py (+7/-5) apport/source_xorg.py (+11/-5) bin/dpkg-log-summary (+9/-11) bin/xdiagnose (+3/-1) bin/xpci (+8/-6) bin/xrandr-tool (+12/-10) data/workloads/run_workloads (+3/-1) debian/changelog (+16/-0) debian/control (+7/-5) debian/pycompat (+0/-1) debian/rules (+17/-1) run-tests (+1/-1) setup.py (+1/-1) tests/test_apport_gpu_hook (+1/-1) tests/test_diagnostic (+3/-1) tests/test_grub_file (+3/-1) tests/test_script_syntax.sh (+5/-3) tests/test_source_xorg (+1/-1) xdiagnose/applet.py (+14/-14) xdiagnose/application.py (+3/-1) xdiagnose/config_update.py (+12/-10) xdiagnose/diagnostics.py (+28/-27) xdiagnose/edid.py (+48/-46) xdiagnose/errors_treeview.py (+3/-1) xdiagnose/info.py (+9/-7) xdiagnose/pci_devices.py (+5/-3) xdiagnose/utils/dates.py (+6/-4) xdiagnose/utils/debug.py (+3/-1) xdiagnose/utils/execute.py (+3/-1) xdiagnose/utils/math.py (+3/-1) xdiagnose/utils/option_handler.py (+3/-1) xdiagnose/utils/paths.py (+4/-2) xdiagnose/utils/screen.py (+5/-3) xdiagnose/utils/text.py (+3/-1) xdiagnose/welcome.py (+6/-4) |
To merge this branch: | bzr merge lp://staging/~ogra/xdiagnose/py3port |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Bryce Harrington | Approve | ||
Colin Watson (community) | Approve | ||
Review via email: mp+109633@code.staging.launchpad.net |
Description of the change
this merge carries all program code changes for python3 support, do not merge it standalone without package changes. this branch is kept separate from py3 package fixes for easier reviewing only, packaging adjustments will follow shortly in another merge proposal.
To post a comment you must log in.
- for k, r in codes.items(): items() ):
+ for k, r in list(codes.
This is just 2to3 being conservative; you don't actually need the list() here, since the body of the loop doesn't modify codes.
+ dates = list(dates.keys())
dates.sort()
return dates
Simpler: "return sorted(dates)"
+ pkgs = list(dpkg_ events. keys())
pkgs.sort()
for pkg in pkgs:
"for pkg in sorted( dpkg_events) :"
+ print(device.name, device.regex, end=' ')
...
Doesn't this end up writing double spaces sometimes (e.g. in the "NOT SUPPORTED" case)? I'd have been inclined to use end=''.
The rest looks fine to me, although I'd have been inclined to add print_function and absolute_import imports from __future__ as applicable just in case there's a need to revert the #! to /usr/bin/python for some reason.