The merge looks good, but there are a bunch of lint errors. There are also dangling whitespace and tab characters that lint doesn't warn you about, since that is normally picked up by the user's editor configuration.
-Edwin
configure.zcml has tab-characters instead of spaces and dangling
whitespace at the end of lines.
test_archive.py has a lot of dangling whitespace.
archive.py has dangling whitespace.
== Pyflakes notices ==
lib/lp/soyuz/tests/test_archive.py
133: local variable 'gedit_main_src_hist' is assigned to but never used
== Pylint notices ==
lib/lp/soyuz/interfaces/archive.py
502: [C0301] Line too long (79/78)
lib/lp/soyuz/tests/test_archive.py
789: [C0301] Line too long (79/78)
lib/lp/soyuz/tests/test_processor.py
30: [C0301] Line too long (79/78)
37: [C0301] Line too long (79/78)
39: [C0301] Line too long (79/78)
Hi Jelmer,
The merge looks good, but there are a bunch of lint errors. There are also dangling whitespace and tab characters that lint doesn't warn you about, since that is normally picked up by the user's editor configuration.
-Edwin
configure.zcml has tab-characters instead of spaces and dangling
whitespace at the end of lines.
test_archive.py has a lot of dangling whitespace.
archive.py has dangling whitespace.
== Pyflakes notices ==
lib/lp/ soyuz/tests/ test_archive. py main_src_ hist' is assigned to but never used
133: local variable 'gedit_
== Pylint notices ==
lib/lp/ soyuz/interface s/archive. py
502: [C0301] Line too long (79/78)
lib/lp/ soyuz/tests/ test_archive. py
789: [C0301] Line too long (79/78)
lib/lp/ soyuz/tests/ test_processor. py
30: [C0301] Line too long (79/78)
37: [C0301] Line too long (79/78)
39: [C0301] Line too long (79/78)