Merge pull request #455 from afuetterer/python3

Remove backwards compatibility for Python <= 3.10

Author: chrismattmann

requirements.txt

@@ -1,6 +1,5 @@
 setuptools
 requests
-pyyaml==5.4.1
 coveralls
 pytest-cov
 memory_profiler

tests/memory_benchmark.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# encoding: utf-8
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -17,13 +16,14 @@
 #
 # To run:
 # python tika/tests/memory_benchmark.py
+import gzip
 import os
 import zlib
-import gzip
 
-import tika.parser
 from memory_profiler import profile
 
+import tika.parser
+
 
 @profile
 def test_parser_binary():

tests/test_benchmark.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# encoding: utf-8
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,16 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# pytest --benchmark-enable --benchmark-timer=time.process_time tests/test_benchmark.py
-
-from pathlib import Path
-import zlib
+# pytest --benchmark-enable --benchmark-timer=time.process_time tika/tests/test_benchmark.py
 import gzip
+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_from_file_service.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# encoding: utf-8
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -17,12 +16,9 @@
 #
 # python -m unittest tika.tests.test_from_file_service
 
-import sys
 import unittest
-if sys.version_info >= (3, 3):
-    from unittest import mock
-else:
-    import mock
+from unittest import mock
+
 import tika.parser
 
 

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

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# encoding: utf-8
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,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!!"

tests/tests_params.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# encoding: utf-8
+
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -19,14 +19,16 @@
 #https://docs.python.org/2/library/unittest.html
 #http://eli.thegreenplace.net/2011/08/02/python-unit-testing-parametrized-test-cases
 #public domain license reference: http://eli.thegreenplace.net/pages/code
- 
+
 #Run
 #python tika/tests/tests_params.py
 
 import csv
 import unittest
+
 import tika.parser
 
+
 class CreateTest(unittest.TestCase):
     "test for file types"
     def __init__(self, methodName='runTest', param1=None, param2=None):
@@ -64,17 +66,17 @@ def test_suite():
         try:
             suite.addTest(CreateTest.parameterize(RemoteTest,param1=x))
         except IOError as e:
-            print(e.strerror)    
-    return suite        
+            print(e.strerror)
+    return suite
 
 def test_url():
     with open('tika/tests/arguments/test_remote_content.csv', 'r') as csvfile:
             urlread = csv.reader(csvfile)
             for url in urlread:
                 yield url[1]
-                
+
 
 
 if __name__ == '__main__':
     suite = test_suite()
-    unittest.TextTestRunner(verbosity=2).run(suite)
+    unittest.TextTestRunner(verbosity=2).run(suite)