fix merge conficts

Author: afuetterer

tests/test_benchmark.py

@@ -15,16 +15,13 @@
 # limitations under the License.
 #
 # pytest --benchmark-enable --benchmark-timer=time.process_time tika/tests/test_benchmark.py
-import os
 import gzip
-from pathlib import Path
-import unittest
 import zlib
 from http import HTTPStatus
+from pathlib import Path
 
 import tika.parser
 
-
 TEST_FILE_PATH = Path(__file__).parent / "files" / "rwservlet.pdf"
 HEADERS = {"Accept-Encoding": "gzip, deflate"}
 

tests/test_detector.py

@@ -2,7 +2,6 @@
 
 from tika import detector
 
-
 TEST_FILE_PATH = Path(__file__).parent / "files" / "rwservlet.pdf"
 
 

tests/test_language.py

@@ -2,7 +2,6 @@
 
 from tika import language
 
-
 TEST_FILE_PATH = Path(__file__).parent / "files" / "rwservlet.pdf"
 
 

tests/test_pdf.py

@@ -2,7 +2,6 @@
 
 from tika import pdf
 
-
 TEST_FILE_PATH = Path(__file__).parent / "files" / "rwservlet.pdf"
 
 

tests/test_tika.py

@@ -14,13 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from pathlib import Path
 from http import HTTPStatus
+from pathlib import Path
 
 import tika.parser
 import tika.tika
 
-
 TEST_FILE_PATH = Path(__file__).parent / "files" / "rwservlet.pdf"
 
 

tests/test_unpack.py

@@ -2,7 +2,6 @@
 
 from tika import unpack
 
-
 # Test data
 TEXT_UTF8 = "Hello, world!! 😎 👽"
 TEXT_ASCII = "Hello, world!!"