Commits (3)
diffoscope (227) UNRELEASED; urgency=medium
diffoscope (227) unstable; urgency=medium
* WIP (generated upon release).
[ Chris Lamb ]
* Don't attempt to attach text-only differences notice if there are no
differences to begin with. (Closes: #1024171, #1024349)
* Don't run Python decompiling tests on Python bytecode that both file(1)
cannot yet detect and Python 3.11 cannot demarshall. (Closes: #1024335)
-- Chris Lamb <lamby@debian.org> Fri, 04 Nov 2022 06:59:43 +0000
-- Chris Lamb <lamby@debian.org> Fri, 18 Nov 2022 09:38:34 +0000
diffoscope (226) unstable; urgency=medium
......
......@@ -17,4 +17,4 @@
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <https://www.gnu.org/licenses/>.
VERSION = "226"
VERSION = "227"
......@@ -39,6 +39,9 @@ class HtmlFile(TextFile):
def compare(self, other, source=None):
difference = super().compare(other, source)
if difference is None:
return difference
# Show text-only differences as a sub-diff.
try:
text = Difference.from_operation(Htmltotext, self.path, other.path)
......
......@@ -53,8 +53,8 @@ def differences(pyc1, pyc2):
@skip_unless_file_version_is_at_least("5.39")
@skipif(
sys.version_info < (3, 8),
reason="Python 3.7 cannot de-marshal test1.pyc-renamed",
sys.version_info[:2] not in {(3, 9), (3, 10)},
reason="Only Python 3.9 and 3.10 can de-marshal test1.pyc-renamed",
)
def test_diff(differences):
assert_diff_startswith(
......