From df50637e7070c2723ab9aad20323767b3b22181c Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 30 Oct 2020 17:15:31 -0400 Subject: [PATCH] ran flake --- Makefile | 6 ++++-- pdfmajor/lexer/keyword.py | 2 +- pdfmajor/lexer/token.py | 24 +----------------------- pdfmajor/parser/parsers.py | 16 +++------------- pdfmajor/parser/stream/PDFStream.py | 2 +- pdfmajor/util.py | 2 +- pdfmajor/xref/xrefdb.py | 1 - setup.py | 1 + tests/test_document.py | 2 -- tests/test_parser.py | 2 +- tests/test_util.py | 1 - tests/test_xref.py | 3 --- 12 files changed, 13 insertions(+), 49 deletions(-) diff --git a/Makefile b/Makefile index a6bea34..6e6a6f3 100644 --- a/Makefile +++ b/Makefile @@ -10,13 +10,15 @@ clean: rm -rf *.egg-info lint: + autoflake --remove-all-unused-imports -r -i pdfmajor + autoflake --remove-all-unused-imports -r -i tests isort pdfmajor black pdfmajor - bandit -r pdfmajor - mypy pdfmajor isort tests black tests + mypy pdfmajor mypy tests + bandit -r pdfmajor test: ./venv/bin/python -m unittest discover tests diff --git a/pdfmajor/lexer/keyword.py b/pdfmajor/lexer/keyword.py index c3f80f4..abf1e27 100644 --- a/pdfmajor/lexer/keyword.py +++ b/pdfmajor/lexer/keyword.py @@ -1,4 +1,4 @@ -from typing import Optional, Union +from typing import Optional from pdfmajor.lexer.exceptions import LexerEOF from pdfmajor.lexer.regex import END_KEYWORD diff --git a/pdfmajor/lexer/token.py b/pdfmajor/lexer/token.py index ad65851..7187317 100644 --- a/pdfmajor/lexer/token.py +++ b/pdfmajor/lexer/token.py @@ -1,6 +1,6 @@ from decimal import Decimal from enum import Enum -from typing import Any, Generic, NamedTuple, TypeVar, Union +from typing import Any, Generic, TypeVar, Union T = TypeVar("T") @@ -42,72 +42,54 @@ class TokenComment(Token[bytes]): Detection of this type of token can be found in PDF 1.7 spec section 7.2.3 """ - pass - class TokenKeyword(Token[bytes]): """Token representing PDF comments Detection of this type of token can be found in PDF 1.7 spec """ - pass - class TokenName(Token[str]): """Token representing literal name tokens Detection of this type of token can be found in PDF 1.7 spec section 7.3.5 """ - pass - class TokenBoolean(Token[bool]): """Token representing PDF booleans Detection of this type of token can be found in PDF 1.7 spec section 7.3.2 """ - pass - class TokenNull(Token[None]): """Token representing the PDF null object Detection of this type of token can be found in PDF 1.7 spec section 7.3.9 """ - pass - class TokenString(Token[bytes]): """Token representing PDF literal string Detection of this type of token can be found in PDF 1.7 spec section 7.3.4.2 """ - pass - class TokenHexString(Token[bytes]): """Token representing PDF hex strings Detection of this type of token can be found in PDF 1.7 spec section 7.3.4.3 """ - pass - class TokenInteger(Token[int]): """Token representing PDF integers Detection of this type of token can be found in PDF 1.7 spec section 7.3.3 """ - pass - class TokenReal(Token[Decimal]): """Token representing PDF decimals Detection of this type of token can be found in PDF 1.7 spec section 7.3.3 """ - pass - TokenNumber = Union[TokenInteger, TokenReal] TokenPrimitive = Union[ @@ -153,8 +135,6 @@ class TokenDictionary(Token[TDictValue]): Detection of this type of token can be found in PDF 1.7 spec section 7.3.7 """ - pass - class TArrayValue(Enum): OPEN = "[" @@ -166,8 +146,6 @@ class TokenArray(Token[TArrayValue]): Detection of this type of token can be found in PDF 1.7 spec section 7.3.6 """ - pass - TokenComplexType = Union[TokenDictionary, TokenArray] TokenComplexTypeVal = Union[TDictValue, TArrayValue] diff --git a/pdfmajor/parser/parsers.py b/pdfmajor/parser/parsers.py index 9a9cbcb..4c21f3e 100644 --- a/pdfmajor/parser/parsers.py +++ b/pdfmajor/parser/parsers.py @@ -1,24 +1,14 @@ -from typing import Iterator, List, NamedTuple, Type, Union +from typing import Iterator, Type, Union from pdfmajor.lexer import iter_tokens -from pdfmajor.lexer.token import ( - Token, - TokenComplexType, - TokenComplexTypeVal, - TokenKeyword, -) +from pdfmajor.lexer.token import TokenComplexType, TokenComplexTypeVal, TokenKeyword from pdfmajor.streambuffer import BufferStream from .exceptions import BrokenFile, EarlyStop, ParserError from .objects.base import PDFContextualObject, PDFObject from .objects.collections import PDFDictionary from .objects.indirect import IndirectObject, ObjectRef -from .objects.primitives import ( - PDFInteger, - PDFNull, - PDFPrimitiveObject, - get_obj_from_token_primitive, -) +from .objects.primitives import PDFInteger, PDFNull, PDFPrimitiveObject from .state import ParsingState from .stream.PDFStream import PDFStream diff --git a/pdfmajor/parser/stream/PDFStream.py b/pdfmajor/parser/stream/PDFStream.py index 27b1250..0b31e33 100644 --- a/pdfmajor/parser/stream/PDFStream.py +++ b/pdfmajor/parser/stream/PDFStream.py @@ -1,4 +1,4 @@ -from typing import Any, List, Optional, TypeVar, Union +from typing import Any, List, Optional from pdfmajor.parser.objects.base import PDFObject from pdfmajor.util import get_single_or_list, to_python, to_python_list diff --git a/pdfmajor/util.py b/pdfmajor/util.py index f2a4e92..3c67f24 100644 --- a/pdfmajor/util.py +++ b/pdfmajor/util.py @@ -1,4 +1,4 @@ -from typing import Any, Callable, Generic, List, Optional, Type, TypeVar, Union +from typing import Any, List, Optional, Type, TypeVar, Union from pdfmajor.parser.objects.base import PDFObject diff --git a/pdfmajor/xref/xrefdb.py b/pdfmajor/xref/xrefdb.py index 955abbd..03126b9 100644 --- a/pdfmajor/xref/xrefdb.py +++ b/pdfmajor/xref/xrefdb.py @@ -1,7 +1,6 @@ from typing import Dict, Iterator, List, Optional, Tuple from pdfmajor.parser import get_first_object -from pdfmajor.parser.objects.base import PDFObject from pdfmajor.parser.objects.collections import PDFDictionary from pdfmajor.parser.objects.indirect import IndirectObject, ObjectRef from pdfmajor.parser.objects.primitives import PDFInteger diff --git a/setup.py b/setup.py index 19e8b31..db75cd7 100644 --- a/setup.py +++ b/setup.py @@ -21,6 +21,7 @@ with open("README.md") as readme_file: "black==20.8b1", "bandit==1.6.2", "isort==5.6.4", + "autoflake==1.4", ] }, "description": "PDF parser", diff --git a/tests/test_document.py b/tests/test_document.py index ab6ed9d..67593a6 100644 --- a/tests/test_document.py +++ b/tests/test_document.py @@ -1,4 +1,3 @@ -from pathlib import Path from unittest import TestCase from pdfmajor.document.catalog import PDFDocumentCatalog @@ -10,7 +9,6 @@ from pdfmajor.parser.objects.primitives import ( PDFName, PDFString, ) - from tests.util import all_pdf_files diff --git a/tests/test_parser.py b/tests/test_parser.py index 36df6ff..582237b 100644 --- a/tests/test_parser.py +++ b/tests/test_parser.py @@ -1,6 +1,6 @@ from decimal import Decimal from pathlib import Path -from typing import Any, Callable, List, Optional +from typing import Any, List from unittest import TestCase from pdfmajor.parser import iter_objects diff --git a/tests/test_util.py b/tests/test_util.py index 2071d06..e69de29 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -1 +0,0 @@ -from unittest import TestCase diff --git a/tests/test_xref.py b/tests/test_xref.py index b269040..5922e1c 100644 --- a/tests/test_xref.py +++ b/tests/test_xref.py @@ -1,11 +1,8 @@ -from pathlib import Path from typing import Dict, Tuple from unittest import TestCase -from pdfmajor.streambuffer import BufferStream from pdfmajor.xref.xref import XRefRow from pdfmajor.xref.xrefdb import XRefDB - from tests.util import all_pdf_files