Remove left-over support for classic implementation, mostly in tests/.

Author: julian-smith-artifex-com

setup.py

@@ -631,7 +631,7 @@ def build():
                     )
     log( f'build(): mupdf_build_dir={mupdf_build_dir!r}')
 
-    # Build rebased `extra` module.
+    # Build `extra` module.
     #
     if 'p' in PYMUPDF_SETUP_FLAVOUR:
         path_so_leaf = _build_extension(
@@ -1094,8 +1094,7 @@ def _build_extension( mupdf_local, mupdf_build_dir, build_type, g_py_limited_api
                 f'{mupdf_local}/include',
                 )
 
-    # Build rebased extension module.
-    log('Building PyMuPDF rebased.')
+    log('Building PyMuPDF extension.')
     compile_extra_cpp = ''
     if darwin:
         # Avoids `error: cannot pass object of non-POD type

src/__init__.py

@@ -25897,6 +25897,6 @@ def deprecated_function( *args, **kwargs):
 
 __version__ = VersionBind
 __doc__ = (
-        f'PyMuPDF {VersionBind}: Python bindings for the MuPDF {VersionFitz} library (rebased implementation).\n'
+        f'PyMuPDF {VersionBind}: Python bindings for the MuPDF {VersionFitz} library.\n'
         f'Python {sys.version_info[0]}.{sys.version_info[1]} running on {sys.platform} ({64 if sys.maxsize > 2**32 else 32}-bit).\n'
         )

tests/test_2548.py

@@ -18,27 +18,20 @@ def test_2548():
             _ = page.get_text()
         except Exception as ee:
             print(f'test_2548: {ee=}')
-            if hasattr(pymupdf, 'mupdf'):
-                # Rebased.
-                expected = "RuntimeError('code=2: cycle in structure tree')"
-            else:
-                # Classic.
-                expected = "RuntimeError('cycle in structure tree')"
+            expected = "RuntimeError('code=2: cycle in structure tree')"
             assert repr(ee) == expected, f'Expected {expected=} but got {repr(ee)=}.'
             e = True
     wt = pymupdf.TOOLS.mupdf_warnings()
     print(f'test_2548(): {wt=}')
 
     # This checks that PyMuPDF 1.23.7 fixes this bug, and also that earlier
     # versions with updated MuPDF also fix the bug.
-    rebased = hasattr(pymupdf, 'mupdf')
     if pymupdf.mupdf_version_tuple >= (1, 27, 1):
         expected = ''
     elif pymupdf.mupdf_version_tuple >= (1, 27):
         expected = 'format error: No common ancestor in structure tree\nstructure tree broken, assume tree is missing'
         expected = '\n'.join([expected] * 5)
     else:
         expected = 'format error: cycle in structure tree\nstructure tree broken, assume tree is missing'
-    if rebased:
-        assert wt == expected, f'expected:\n    {expected!r}\nwt:\n    {wt!r}\n'
+    assert wt == expected, f'expected:\n    {expected!r}\nwt:\n    {wt!r}\n'
     assert not e

tests/test_2904.py

@@ -27,12 +27,7 @@ def test_2904():
                 print(f'{pymupdf.mupdf_version_tuple=}: {page_id=} {i=} {e=} {img=}:')
             if page_id == 5 and i==3:
                 assert e
-                if hasattr(pymupdf, 'mupdf'):
-                    # rebased.
-                    assert str(e) == 'code=8: Failed to read JPX header'
-                else:
-                    # classic
-                    assert str(e) == 'Failed to read JPX header'
+                assert str(e) == 'code=8: Failed to read JPX header'
             else:
                 assert not e
 

tests/test_codespell.py

@@ -10,16 +10,12 @@
 
 def test_codespell():
     '''
-    Check rebased Python code with codespell.
+    Check Python code with codespell.
     '''
     if os.environ.get('PYODIDE_ROOT'):
         print('test_codespell(): not running on Pyodide - cannot run child processes.')
         return
 
-    if not hasattr(pymupdf, 'mupdf'):
-        print('Not running codespell with classic implementation.')
-        return
-    
     if platform.system() == 'Windows':
         # Git commands seem to fail on Github Windows runners.
         print(f'test_codespell(): Not running on Windows')

tests/test_flake8.py

@@ -7,15 +7,12 @@
 
 def test_flake8():
     '''
-    Check rebased Python code with flake8.
+    Check Python code with flake8.
     '''
     if os.environ.get('PYODIDE_ROOT'):
         print('test_flake8(): not running on Pyodide - cannot run child processes.')
         return
 
-    if not hasattr(pymupdf, 'mupdf'):
-        print(f'Not running flake8 with classic implementation.')
-        return
     ignores = (
             'E123', # closing bracket does not match indentation of opening bracket's line
             'E124', # closing bracket does not match visual indentation

tests/test_font.py

@@ -34,9 +34,8 @@ def test_font1():
     # Also check we can get font's bbox.
     bbox1 = font.bbox
     print(f'{bbox1=}')
-    if hasattr(pymupdf, 'mupdf'):
-        bbox2 = font.this.fz_font_bbox()
-        assert bbox2 == bbox1
+    bbox2 = font.this.fz_font_bbox()
+    assert bbox2 == bbox1
 
 
 def test_font2():
@@ -105,9 +104,6 @@ def test_fontarchive():
             ]
 
 def test_load_system_font():
-    if not hasattr(pymupdf, 'mupdf'):
-        print(f'test_load_system_font(): Not running on classic.')
-        return
     trace = list()
     def font_f(name, bold, italic, needs_exact_metrics):
         trace.append((name, bold, italic, needs_exact_metrics))
@@ -130,9 +126,6 @@ def f_fallback(script, language, serif, bold, italic):
 
 
 def test_mupdf_subset_fonts2():
-    if not hasattr(pymupdf, 'mupdf'):
-        print('Not running on rebased.')
-        return
     path = os.path.abspath(f'{__file__}/../../tests/resources/2.pdf')
     with pymupdf.open(path) as doc:
         n = len(doc)

tests/test_general.py

@@ -86,13 +86,11 @@ def test_wrapcontents():
     page.set_contents(xref)
     assert len(page.get_contents()) == 1
     page.clean_contents()
-    rebased = hasattr(pymupdf, 'mupdf')
-    if rebased:
-        wt = pymupdf.TOOLS.mupdf_warnings()
-        if (1, 26, 0) <= pymupdf.mupdf_version_tuple < (1, 27):
-            assert wt == 'bogus font ascent/descent values (0 / 0)\nPDF stream Length incorrect'
-        else:
-            assert wt == 'PDF stream Length incorrect'
+    wt = pymupdf.TOOLS.mupdf_warnings()
+    if (1, 26, 0) <= pymupdf.mupdf_version_tuple < (1, 27):
+        assert wt == 'bogus font ascent/descent values (0 / 0)\nPDF stream Length incorrect'
+    else:
+        assert wt == 'PDF stream Length incorrect'
 
 
 def test_page_clean_contents():
@@ -300,8 +298,8 @@ def test_2533():
     Search for a unique char on page and confirm that page.get_texttrace()
     returns the same bbox as the search method.
     """
-    if hasattr(pymupdf, 'mupdf') and not pymupdf.g_use_extra:
-        print('Not running test_2533() because rebased with use_extra=0 known to fail')
+    if not pymupdf.g_use_extra:
+        print('Not running test_2533() because use_extra=0 known to fail')
         return
     pymupdf.TOOLS.set_small_glyph_heights(True)
     try:
@@ -412,18 +410,16 @@ def test_2108():
 def test_2238():
     filepath = f'{scriptdir}/resources/test2238.pdf'
     doc = pymupdf.open(filepath)
-    rebased = hasattr(pymupdf, 'mupdf')
-    if rebased:
-        wt = pymupdf.TOOLS.mupdf_warnings()
-        wt_expected = ''
-        if pymupdf.mupdf_version_tuple >= (1, 26):
-            wt_expected += 'garbage bytes before version marker\n'
-            wt_expected += 'syntax error: expected \'obj\' keyword (6 0 ?)\n'
-        else:
-            wt_expected += 'format error: cannot recognize version marker\n'
-        wt_expected += 'trying to repair broken xref\n'
-        wt_expected += 'repairing PDF document'
-        assert wt == wt_expected, f'{wt=}'
+    wt = pymupdf.TOOLS.mupdf_warnings()
+    wt_expected = ''
+    if pymupdf.mupdf_version_tuple >= (1, 26):
+        wt_expected += 'garbage bytes before version marker\n'
+        wt_expected += 'syntax error: expected \'obj\' keyword (6 0 ?)\n'
+    else:
+        wt_expected += 'format error: cannot recognize version marker\n'
+    wt_expected += 'trying to repair broken xref\n'
+    wt_expected += 'repairing PDF document'
+    assert wt == wt_expected, f'{wt=}'
     first_page = doc.load_page(0).get_text('text', clip=pymupdf.INFINITE_RECT())
     last_page = doc.load_page(-1).get_text('text', clip=pymupdf.INFINITE_RECT())
 
@@ -619,7 +615,6 @@ def test_2596():
     page = doc.reload_page(page)
     pix1 = page.get_pixmap()
     assert pix1.samples == pix0.samples
-    rebased = hasattr(pymupdf, 'mupdf')
     if pymupdf.mupdf_version_tuple < (1, 26, 6):
         wt = pymupdf.TOOLS.mupdf_warnings()
         assert wt == 'too many indirections (possible indirection cycle involving 24 0 R)'
@@ -747,14 +742,12 @@ def assert_rects_approx_eq(a, b):
     print(f'test_2710(): {pymupdf.mupdf_version_tuple=}')
     # 2023-11-05: Currently broken in mupdf master.
     print(f'test_2710(): Not Checking page.rect and rect.')
-    rebased = hasattr(pymupdf, 'mupdf')
-    if rebased:
-        wt = pymupdf.TOOLS.mupdf_warnings()
-        assert wt == (
-                "syntax error: cannot find ExtGState resource 'GS7'\n"
-                "syntax error: cannot find ExtGState resource 'GS8'\n"
-                "encountered syntax errors; page may not be correct"
-                )
+    wt = pymupdf.TOOLS.mupdf_warnings()
+    assert wt == (
+            "syntax error: cannot find ExtGState resource 'GS7'\n"
+            "syntax error: cannot find ExtGState resource 'GS8'\n"
+            "encountered syntax errors; page may not be correct"
+            )
 
 
 def test_2736():
@@ -930,8 +923,6 @@ def test_3081():
     path1 = os.path.abspath(f'{__file__}/../../tests/resources/1.pdf')
     path2 = os.path.abspath(f'{__file__}/../../tests/test_3081-2.pdf')
 
-    rebased = hasattr(pymupdf, 'mupdf')
-    
     import shutil
     import sys
     import traceback
@@ -953,9 +944,8 @@ def next_fd():
     page = document[0]
     fd2 = next_fd()
     document.close()
-    if rebased:
-        assert document.this is None
-        assert page.this is None
+    assert document.this is None
+    assert page.this is None
     try:
         document.page_count()
     except Exception as e:
@@ -970,10 +960,7 @@ def next_fd():
     except Exception as e:
         print(f'Received expected exception: {e}')
         #traceback.print_exc(file=sys.stdout)
-        if rebased:
-            assert str(e) == 'page is None'
-        else:
-            assert str(e) == 'orphaned object: parent is None'
+        assert str(e) == 'page is None'
     else:
         assert 0, 'Did not receive expected exception.'
     page = None
@@ -996,17 +983,11 @@ def test_3112_set_xml_metadata():
     document.set_xml_metadata('hello world')
 
 def test_archive_3126():
-    if not hasattr(pymupdf, 'mupdf'):
-        print(f'Not running because known to fail with classic.')
-        return
     p = os.path.abspath(f'{__file__}/../../tests/resources')
     p = pathlib.Path(p)
     archive = pymupdf.Archive(p)
 
 def test_3140():
-    if not hasattr(pymupdf, 'mupdf'):
-        print(f'Not running test_3140 on classic, because Page.insert_htmlbox() not available.')
-        return
     css2 = ''
     path = os.path.abspath(f'{__file__}/../../tests/resources/2.pdf')
     oldfile = os.path.abspath(f'{__file__}/../../tests/test_3140_old.pdf')
@@ -1043,9 +1024,6 @@ def test_cli():
         print('test_cli(): not running on Pyodide - cannot run child processes.')
         return
 
-    if not hasattr(pymupdf, 'mupdf'):
-        print('test_cli(): Not running on classic because of fitz_old.')
-        return
     import subprocess
     subprocess.run(f'pymupdf -h', shell=1, check=1)
 
@@ -1108,9 +1086,6 @@ def test_cli_out():
         print('test_cli_out(): not running on Pyodide - cannot run child processes.')
         return
 
-    if not hasattr(pymupdf, 'mupdf'):
-        print('test_cli(): Not running on classic because of fitz_old.')
-        return
     import platform
     import re
     import subprocess
@@ -1395,10 +1370,6 @@ def relpath(path, start=None):
 
 def test_open():
 
-    if not hasattr(pymupdf, 'mupdf'):
-        print('test_open(): not running on classic.')
-        return
-    
     import re
     import textwrap
     import traceback
@@ -1650,9 +1621,6 @@ def show(r, name):
 
 
 def test_533():
-    if not hasattr(pymupdf, 'mupdf'):
-        print('test_533(): Not running on classic.')
-        return
     path = os.path.abspath(f'{__file__}/../../tests/resources/2.pdf')
     doc = pymupdf.open(path)
     print()

tests/test_objectstreams.py

@@ -6,10 +6,6 @@ def test_objectstream1():
     This option compresses PDF object definitions into a special object type
     "ObjStm". We test its presence by searching for that /Type.
     """
-    if not hasattr(pymupdf, "mupdf"):
-        # only implemented for rebased
-        return
-
     # make some arbitrary page with content
     text = "Hello, World! Hallo, Welt!"
     doc = pymupdf.open()
@@ -32,10 +28,6 @@ def test_objectstream2():
     This option compresses PDF object definitions into a special object type
     "ObjStm". We test its presence by searching for that /Type.
     """
-    if not hasattr(pymupdf, "mupdf"):
-        # only implemented for rebased
-        return
-
     # make some arbitrary page with content
     text = "Hello, World! Hallo, Welt!"
     doc = pymupdf.open()
@@ -58,9 +50,6 @@ def test_objectstream3():
     """Test ez_save().
     Should automatically use object streams
     """
-    if not hasattr(pymupdf, "mupdf"):
-        # only implemented for rebased
-        return
     import io
 
     fp = io.BytesIO()

tests/test_pixmap.py

@@ -184,7 +184,7 @@ def product(x, y):
                 for xx in x:
                     yield (xx, yy)
         n = 0
-        # We use a small subset of the image because non-optimised rebase gets
+        # We use a small subset of the image because non-optimised build gets
         # very slow.
         for pos in product(range(100), range(100)):
             if sum(pix.pixel(pos[0], pos[1])) >= 600:
@@ -247,15 +247,13 @@ def test_3072():
     pix = page_49.get_pixmap(clip=rect, matrix=zoom)
     image_save_path = f'{out}/2.jpg'
     pix.save(image_save_path, jpg_quality=95)
-    rebase = hasattr(pymupdf, 'mupdf')
-    if rebase:
-        wt = pymupdf.TOOLS.mupdf_warnings()
-        assert wt == (
-                "syntax error: cannot find ExtGState resource 'BlendMode0'\n"
-                "encountered syntax errors; page may not be correct\n"
-                "syntax error: cannot find ExtGState resource 'BlendMode0'\n"
-                "encountered syntax errors; page may not be correct"
-                )
+    wt = pymupdf.TOOLS.mupdf_warnings()
+    assert wt == (
+            "syntax error: cannot find ExtGState resource 'BlendMode0'\n"
+            "encountered syntax errors; page may not be correct\n"
+            "syntax error: cannot find ExtGState resource 'BlendMode0'\n"
+            "encountered syntax errors; page may not be correct"
+            )
 
 def test_3134():
     doc = pymupdf.Document()