From 754d05480dbbc09e292b40f782210558d8d11321 Mon Sep 17 00:00:00 2001 From: Alban Diquet Date: Mon, 17 Aug 2020 21:49:55 -0700 Subject: [PATCH 1/2] Enable no_implicit_optional in mypy config --- mypy.ini | 1 + securedrop/models.py | 4 ++-- securedrop/worker.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mypy.ini b/mypy.ini index 0421584994..f72c4be898 100644 --- a/mypy.ini +++ b/mypy.ini @@ -1,5 +1,6 @@ [mypy] ignore_missing_imports = True +no_implicit_optional = True python_version = 3.5 [mypy-config] diff --git a/securedrop/models.py b/securedrop/models.py index dcd26bbaf0..994a35b4d8 100644 --- a/securedrop/models.py +++ b/securedrop/models.py @@ -82,8 +82,8 @@ class Source(db.Model): MAX_CODENAME_LEN = 128 def __init__(self, - filesystem_id: str = None, - journalist_designation: str = None) -> None: + filesystem_id: Optional[str] = None, + journalist_designation: Optional[str] = None) -> None: self.filesystem_id = filesystem_id self.journalist_designation = journalist_designation self.uuid = str(uuid.uuid4()) diff --git a/securedrop/worker.py b/securedrop/worker.py index 3360af9642..ec117304f4 100644 --- a/securedrop/worker.py +++ b/securedrop/worker.py @@ -11,7 +11,7 @@ from sdconfig import config -def create_queue(name: str = None, timeout: int = 3600) -> Queue: +def create_queue(name: Optional[str] = None, timeout: int = 3600) -> Queue: """ Create an rq ``Queue`` named ``name`` with default timeout ``timeout``. @@ -52,7 +52,7 @@ def worker_for_job(job_id: str) -> Optional[Worker]: return None -def requeue_interrupted_jobs(queue_name: str = None) -> None: +def requeue_interrupted_jobs(queue_name: Optional[str] = None) -> None: """ Requeues jobs found in the given queue's started job registry. From 6503d2dd67697dd3a4ddc7a4b0ef1739564f2f31 Mon Sep 17 00:00:00 2001 From: Alban Diquet Date: Mon, 17 Aug 2020 22:11:19 -0700 Subject: [PATCH 2/2] Fix pylint error --- securedrop/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/securedrop/models.py b/securedrop/models.py index 994a35b4d8..b908c64af5 100644 --- a/securedrop/models.py +++ b/securedrop/models.py @@ -82,8 +82,8 @@ class Source(db.Model): MAX_CODENAME_LEN = 128 def __init__(self, - filesystem_id: Optional[str] = None, - journalist_designation: Optional[str] = None) -> None: + filesystem_id: 'Optional[str]' = None, + journalist_designation: 'Optional[str]' = None) -> None: self.filesystem_id = filesystem_id self.journalist_designation = journalist_designation self.uuid = str(uuid.uuid4())