[mw] Fix more tests after migration to Python 3

Author: amotl

patzilla/access/epo/ops/api.py

@@ -907,7 +907,7 @@ def handle_error(response, location):
     if len(request.errors) == 1:
         error_info = request.errors[0].get('description')
         if error_info.get('status_code') == 404:
-            error_content = error_info.get('content', '')
+            error_content = error_info.get('content', b'')
             url = error_info.get('url')
             status = str(error_info.get('status_code', '')) + ' ' + error_info.get('reason', '')
 

patzilla/access/epo/ops/commands.py

@@ -21,6 +21,7 @@
 """
 import json
 import logging
+import sys
 from datetime import date, timedelta
 
 import click
@@ -133,7 +134,7 @@ def image(ctx, document, page, kind, format):
     Access the OPS image acquisition API, see OPS handbook section 3.1.3.
     """
     payload = get_ops_image(document, page, kind, format)
-    print(payload)
+    sys.stdout.buffer.write(payload)
 
 
 ops_cli.add_command(cmd=usage)

patzilla/util/cql/pyparsing/test/05_misc.rst

@@ -100,4 +100,4 @@ Error explanation
 ...     CQL('foo bar', logging=False).dumps()
 ... except Exception as ex:
 ...     ex.explanation
-'foo bar\n    ^\n\nExpected end of text, found 'bar'  (at char 4), (line:1, col:5)'
+"foo bar\n    ^\n\nExpected end of text, found 'bar'  (at char 4), (line:1, col:5)"

setup.cfg

@@ -13,6 +13,8 @@ addopts = -rA -vvv
     --app-cache-backend=filesystem
     patzilla tests -k 'not uspto'
 
+doctest_optionflags = NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL
+
 log_level = DEBUG
 log_cli_level = DEBUG
 

tests/access/test_epo_ops.py

@@ -74,15 +74,15 @@ def test_search_biblio_compact_success(app_request):
     assert jpath('/0/pubdate', compact) == "1995-08-09"
     assert jpath('/1/pubnumber', compact) == "EP0666667"
     assert jpath('/1/pubdate', compact) == "1995-08-09"
-    assert compact[0].keys() == compact[1].keys() == [
+    assert sorted(compact[0].keys()) == sorted(compact[1].keys()) == [
+        'abstract',
         'appdate',
         'applicant',
-        'pubdate',
         'appnumber',
-        'title',
-        'abstract',
-        'pubnumber',
         'inventor',
+        'pubdate',
+        'pubnumber',
+        'title',
     ]
 
 
@@ -573,4 +573,4 @@ def test_register_not_found_failure(app_request):
 
 def test_service_usage(app_request):
     response = ops_service_usage("01/01/2022", "02/01/2022")
-    assert response.keys() == ["response-size", "time-range", "message-count"]
+    assert sorted(response.keys()) == ["message-count", "response-size", "time-range"]

tests/commands/test_commands_ops.py

@@ -76,8 +76,8 @@ def test_command_ops_image_fulldocument_pdf_success():
     result = runner.invoke(cli, "ops image --document=EP0666666B1 --page=1", catch_exceptions=False)
     assert result.exit_code == 0
 
-    assert result.stdout.startswith("b'%PDF-1.4")
-    assert 30000 < len(result.stdout) < 50000
+    assert result.stdout_bytes.startswith(b"%PDF-1.4")
+    assert 30_000 < len(result.stdout_bytes) < 150_000
 
 
 def test_command_ops_image_fulldocument_tiff_success():
@@ -89,7 +89,7 @@ def test_command_ops_image_fulldocument_tiff_success():
     result = runner.invoke(cli, "ops image --document=EP0666666B1 --page=1 --format=tiff", catch_exceptions=False)
     assert result.exit_code == 0
 
-    assert result.stdout.startswith("b'\x4d\x4d\x00\x2a")
+    assert result.stdout_bytes.startswith(b"\x4d\x4d\x00\x2a")
 
 
 def test_command_ops_image_drawing_pdf_success():
@@ -101,8 +101,8 @@ def test_command_ops_image_drawing_pdf_success():
     result = runner.invoke(cli, "ops image --document=EP0666666B1 --kind=FullDocumentDrawing --page=1", catch_exceptions=False)
     assert result.exit_code == 0
 
-    assert result.stdout.startswith("b'%PDF-1.4")
-    assert 10000 < len(result.stdout) < 20000
+    assert result.stdout_bytes.startswith(b"%PDF-1.4")
+    assert 10_000 < len(result.stdout_bytes) < 20_000
 
 
 def test_command_ops_image_failure():