fixed various type issues
This commit is contained in:
1 parent
838ed91c5f
commit
d40da248de
13 files changed
+83
-85
No files matched your search
@@ -13,7 +13,7 @@ from pdfmajor.lexer.token import (
|
||||
Token,
|
||||
TokenArray,
|
||||
TokenDictionary,
|
||||
TokenKeyword
|
||||
TokenKeyword,
|
||||
)
|
||||
from pdfmajor.streambuffer import BufferStream
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
from pdfmajor.parser.objects.primitives import get_obj_from_token_primitive
|
||||
from typing import Iterator, Optional
|
||||
|
||||
from pdfmajor.lexer import iter_tokens
|
||||
@@ -10,6 +9,7 @@ from pdfmajor.lexer.token import (
|
||||
TokenDictionary,
|
||||
TokenKeyword,
|
||||
)
|
||||
from pdfmajor.parser.objects.primitives import get_obj_from_token_primitive
|
||||
from pdfmajor.streambuffer import BufferStream
|
||||
|
||||
from .exceptions import InvalidKeywordPos
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from decimal import Decimal
|
||||
from typing import Dict, Generic, Optional, Type, TypeVar
|
||||
from typing import Dict, Generic, Optional, Type, TypeVar, Union
|
||||
|
||||
from pdfmajor.lexer.token import (
|
||||
Token,
|
||||
@@ -80,7 +80,9 @@ _token_to_obj_map: Dict[Type[Token], Type[PDFPrimitiveObject]] = {
|
||||
}
|
||||
|
||||
|
||||
def get_obj_from_token_primitive(token: Token) -> Optional[PDFPrimitiveObject]:
|
||||
def get_obj_from_token_primitive(
|
||||
token: Token,
|
||||
) -> Optional[Union[PDFPrimitiveObject, PDFNull]]:
|
||||
"""converts tokens to their primitive object counterparts
|
||||
|
||||
Args:
|
||||
@@ -91,7 +93,7 @@ def get_obj_from_token_primitive(token: Token) -> Optional[PDFPrimitiveObject]:
|
||||
"""
|
||||
obj_const = _token_to_obj_map.get(type(token), None)
|
||||
if obj_const:
|
||||
return obj_const.from_token(token)
|
||||
return obj_const.from_token(token) # type: ignore
|
||||
elif isinstance(token, TokenNull):
|
||||
return PDFNull()
|
||||
else:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from typing import Iterator, List, NamedTuple, Type
|
||||
from typing import Iterator, List, NamedTuple, Type, Union
|
||||
|
||||
from pdfmajor.lexer import iter_tokens
|
||||
from pdfmajor.lexer.token import (
|
||||
@@ -10,19 +10,22 @@ from pdfmajor.lexer.token import (
|
||||
from pdfmajor.streambuffer import BufferStream
|
||||
|
||||
from .exceptions import BrokenFile, EarlyStop, ParserError
|
||||
from .stream.PDFStream import PDFStream
|
||||
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 .state import ParsingState
|
||||
from .stream.PDFStream import PDFStream
|
||||
|
||||
|
||||
def on_primitive(pobj: PDFPrimitiveObject, state: ParsingState) -> Iterator[PDFObject]:
|
||||
def on_primitive(
|
||||
pobj: Union[PDFPrimitiveObject, PDFNull], state: ParsingState
|
||||
) -> Iterator[PDFObject]:
|
||||
"""Parses out a primitive value from the token
|
||||
|
||||
Args:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import io
|
||||
from contextlib import contextmanager
|
||||
from typing import Iterator, NamedTuple, Optional
|
||||
from typing import BinaryIO, Iterator, NamedTuple, Optional
|
||||
|
||||
from pdfmajor.exceptions import PDFMajorException
|
||||
|
||||
@@ -20,7 +20,7 @@ class BufferStream:
|
||||
|
||||
__slots__ = ["fp", "buffer_size"]
|
||||
|
||||
def __init__(self, fp: io.BufferedIOBase, buffer_size: int = 4096) -> None:
|
||||
def __init__(self, fp: BinaryIO, buffer_size: int = 4096) -> None:
|
||||
"""[summary]
|
||||
|
||||
Args:
|
||||
|
||||
Whitespace-only changes.
@@ -45,7 +45,7 @@ class PDFFileTrailer(NamedTuple):
|
||||
prev=pdfdict.get("Prev", None),
|
||||
info=pdfdict.get("Info", None),
|
||||
encrypt=encrypt,
|
||||
encrypt_id=encrypt_id,
|
||||
encrypt_id=encrypt_id, # type: ignore
|
||||
)
|
||||
|
||||
@classmethod
|
||||
|
||||
+10
-7
@@ -94,8 +94,9 @@ class XRefDB:
|
||||
else:
|
||||
found_obj_type = "{{PDFPrimitive}}"
|
||||
else:
|
||||
obj = self.objs.get(raw_ref, None)
|
||||
if obj is None:
|
||||
try:
|
||||
obj = self.objs[raw_ref]
|
||||
except KeyError:
|
||||
raise XRefError(f"Missing valid obj for {xref}")
|
||||
if found_obj_type is None:
|
||||
raise XRefError("WARN: Failed to find a valid type for", xref)
|
||||
@@ -106,15 +107,17 @@ class XRefDB:
|
||||
obj_num: ObjNum,
|
||||
gen_num: GenNum,
|
||||
buffer: BufferStream,
|
||||
) -> PDFObject:
|
||||
) -> IndirectObject:
|
||||
raw_ref, xref = (obj_num, gen_num), self.xrefs[(obj_num, gen_num)]
|
||||
obj = self.objs.get(raw_ref, None)
|
||||
if obj is None:
|
||||
with buffer.get_window():
|
||||
obj = get_first_object(buffer, xref.offset)
|
||||
if not isinstance(obj, IndirectObject):
|
||||
raise InvalidXref(f"Offset for {xref} returned an invalid object {obj}")
|
||||
self.objs[raw_ref] = obj
|
||||
parsed_obj = get_first_object(buffer, xref.offset)
|
||||
if not isinstance(parsed_obj, IndirectObject):
|
||||
raise InvalidXref(
|
||||
f"Offset for {xref} returned an invalid object {parsed_obj}"
|
||||
)
|
||||
self.objs[raw_ref] = parsed_obj
|
||||
return self.objs[raw_ref]
|
||||
|
||||
def has_xref(self, obj_num: ObjNum, gen_num: GenNum) -> bool:
|
||||
|
||||
Reference in new issue
Block a user