From 1093e58eaf77ba4348b14a3fd522467e813105ac Mon Sep 17 00:00:00 2001 From: Jinge Li <9894243+chinapandaman@users.noreply.github.com> Date: Sat, 13 Jul 2024 19:42:01 +0000 Subject: [PATCH] PPF-698: done for pyright for now --- PyPDFForm/middleware/dropdown.py | 2 +- PyPDFForm/middleware/text.py | 2 +- pyrightconfig.json | 6 +++--- scripts/bump_version.py | 7 +++++-- scripts/create_release.py | 4 +++- setup.py | 4 +++- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/PyPDFForm/middleware/dropdown.py b/PyPDFForm/middleware/dropdown.py index 25b6aabc..7a94b3d3 100644 --- a/PyPDFForm/middleware/dropdown.py +++ b/PyPDFForm/middleware/dropdown.py @@ -16,7 +16,7 @@ def __init__( super().__init__(name, value) - self.choices = None + self.choices = [] @property def schema_definition(self) -> dict: diff --git a/PyPDFForm/middleware/text.py b/PyPDFForm/middleware/text.py index 783ac93e..42518282 100644 --- a/PyPDFForm/middleware/text.py +++ b/PyPDFForm/middleware/text.py @@ -22,7 +22,7 @@ def __init__( self.text_wrap_length = None self.max_length = None self.comb = None - self.character_paddings = None + self.character_paddings = [] self.text_lines = None self.text_line_x_coordinates = None self.preview = False diff --git a/pyrightconfig.json b/pyrightconfig.json index a93e89c1..fe417c69 100644 --- a/pyrightconfig.json +++ b/pyrightconfig.json @@ -2,11 +2,10 @@ "typeCheckingMode": "basic", "reportArgumentType": "none", "reportAttributeAccessIssue": "none", - "reportOptionalSubscript": "none", "reportIndexIssue": "none", "reportOperatorIssue": "none", "reportGeneralTypeIssues": "none", - "reportOptionalMemberAccess": "none", + "reportOptionalMemberAccess": "error", "reportPossiblyUnboundVariable": "error", "reportUnusedImport": "error", "reportIncompatibleMethodOverride": "error", @@ -14,5 +13,6 @@ "reportPrivateUsage": "error", "reportSelfClsParameterName": "error", "reportReturnType": "error", - "reportAssignmentType": "error" + "reportAssignmentType": "error", + "reportOptionalSubscript": "error" } diff --git a/scripts/bump_version.py b/scripts/bump_version.py index 88c70a04..845e3ebd 100644 --- a/scripts/bump_version.py +++ b/scripts/bump_version.py @@ -11,11 +11,14 @@ print("Bump version cannot be done on a non-issue branch.") sys.exit(1) + v = "" with open("PyPDFForm/__init__.py", encoding="utf8") as f: - version = re.search(r'__version__ = "(.*?)"', f.read()).group(1) + version = re.search(r'__version__ = "(.*?)"', f.read()) + if version: + v = v.group(1) new_version = ".".join( - version.split(".")[:-1] + [str(int(version.split(".")[-1]) + 1)] + v.split(".")[:-1] + [str(int(v.split(".")[-1]) + 1)] ) with open("PyPDFForm/__init__.py", encoding="utf8") as f: diff --git a/scripts/create_release.py b/scripts/create_release.py index de980291..af73029d 100644 --- a/scripts/create_release.py +++ b/scripts/create_release.py @@ -10,7 +10,9 @@ if __name__ == "__main__": with open("PyPDFForm/__init__.py", encoding="utf8") as f: - version = re.search(r'__version__ = "(.*?)"', f.read()).group(1) + version = re.search(r'__version__ = "(.*?)"', f.read()) + if version: + version = version.group(1) latest_version = sys.argv[1].replace("(", "").replace(")", "") print(f"Latest deployed version: v{latest_version}.") diff --git a/setup.py b/setup.py index 882f3ac0..32016ada 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,9 @@ import setuptools with open("PyPDFForm/__init__.py", encoding="utf8") as f: - version = re.search(r'__version__ = "(.*?)"', f.read()).group(1) + version = re.search(r'__version__ = "(.*?)"', f.read()) + if version: + version = version.group(1) with open("README.md", mode="r", encoding="utf-8") as fh: long_description = fh.read()