From 9a9cfee40eec2db820d0e26708618b13cddaecf4 Mon Sep 17 00:00:00 2001 From: Martin Thoma Date: Sun, 8 May 2022 10:41:00 +0200 Subject: [PATCH] =?UTF-8?q?MAINT:=20merger.py=20=E2=9E=94=20=5Fmerger.py?= =?UTF-8?q?=20(#864)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG | 7 ++++--- PyPDF2/__init__.py | 2 +- PyPDF2/{merger.py => _merger.py} | 0 3 files changed, 5 insertions(+), 4 deletions(-) rename PyPDF2/{merger.py => _merger.py} (100%) diff --git a/CHANGELOG b/CHANGELOG index 66c317969..6e2e2fe6e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,13 @@ Version 2.0.0 ------------- -Deprecations (DEP): +Breaking Changes(DEP): - PyPDF2 2.0 requires Python 3.6+. Python 2.7 and 3.5 support were dropped. +- PdfFileReader: The "warndest" parameter was removed - PdfFileReader and PdfFileMerger no longer have the `overwriteWarnings` parameter. The new behavior is `overwriteWarnings=False`. -- PdfFileReader: The "warndest" parameter was removed -- merger: OutlinesObject was removed. +- merger: OutlinesObject was removed without replacement. +- merger.py ➔ _merger.py: You must import PdfFileMerger from PyPDF2 directly. - utils: * `ConvertFunctionsToVirtualList` was removed * `formatWarning` was removed diff --git a/PyPDF2/__init__.py b/PyPDF2/__init__.py index 3b84778ae..67a30d93a 100644 --- a/PyPDF2/__init__.py +++ b/PyPDF2/__init__.py @@ -1,7 +1,7 @@ +from PyPDF2._merger import PdfFileMerger from PyPDF2._reader import PdfFileReader from PyPDF2._version import __version__ from PyPDF2._writer import PdfFileWriter -from PyPDF2.merger import PdfFileMerger from PyPDF2.pagerange import PageRange, parse_filename_page_ranges from PyPDF2.papersizes import PaperSize diff --git a/PyPDF2/merger.py b/PyPDF2/_merger.py similarity index 100% rename from PyPDF2/merger.py rename to PyPDF2/_merger.py