Skip to content

Commit 8250a04

Browse files
Try to resolve pylint error
1 parent c74bde5 commit 8250a04

6 files changed

Lines changed: 25 additions & 12 deletions

File tree

documentcloud/addons/models.py

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ def dispatch(self, uuid, user, documents, query, parameters, event_id):
189189
f"{self.api_url}/dispatches",
190190
headers=self.api_headers,
191191
json={"event_type": self.name, "client_payload": payload},
192+
timeout=10
192193
)
193194
resp.raise_for_status()
194195

@@ -197,6 +198,7 @@ def update_config(self):
197198
resp = requests.get(
198199
f"{self.api_url}/contents/config.yaml",
199200
headers={**self.api_headers, "Accept": "application/vnd.github.v3.raw"},
201+
timeout=10
200202
)
201203
if resp.status_code == 404:
202204
self.error = True
@@ -380,7 +382,7 @@ def find_run_id(self):
380382
url = f"{self.addon.api_url}/actions/runs?created=%3E{date_filter}"
381383
while url is not None:
382384
logger.info("[FIND RUN ID] get %s", url)
383-
resp = requests.get(url, headers=self.addon.api_headers)
385+
resp = requests.get(url, headers=self.addon.api_headers, timeout=10)
384386
resp.raise_for_status()
385387
url = resp.links.get("next", {}).get("url")
386388
resp_json = resp.json()
@@ -403,7 +405,11 @@ def find_run_id(self):
403405
else:
404406
continue
405407

406-
resp = requests.get(jobs_url, headers=self.addon.api_headers)
408+
resp = requests.get(
409+
jobs_url,
410+
headers=self.addon.api_headers,
411+
timeout=10
412+
)
407413
resp.raise_for_status()
408414

409415
jobs = resp.json()["jobs"]
@@ -435,6 +441,7 @@ def set_status(self):
435441
resp = requests.get(
436442
f"{self.addon.api_url}/actions/runs/{self.run_id}",
437443
headers=self.addon.api_headers,
444+
timeout=10
438445
)
439446
if resp.status_code != 200:
440447
logger.info(
@@ -449,7 +456,9 @@ def set_status(self):
449456
# if we failed, check the job status to check for 'cancelled'
450457
# which means it timed out
451458
resp = requests.get(
452-
resp.json()["jobs_url"], headers=self.addon.api_headers
459+
resp.json()["jobs_url"],
460+
headers=self.addon.api_headers,
461+
timeout=10
453462
)
454463
if resp.status_code == 200 and len(resp.json()["jobs"]) > 0:
455464
status = resp.json()["jobs"][0]["conclusion"]
@@ -510,6 +519,7 @@ def cancel(self):
510519
resp = requests.post(
511520
f"{self.addon.api_url}/actions/runs/{self.run_id}/cancel",
512521
headers=self.addon.api_headers,
522+
timeout=10
513523
)
514524
if resp.status_code == 202:
515525
return "succeed"
@@ -718,6 +728,7 @@ def token(self):
718728
"https://api.github.com/app/installations/"
719729
f"{self.iid}/access_tokens",
720730
headers=headers,
731+
timeout=10
721732
)
722733
resp = resp.json()
723734
token = resp["token"]

documentcloud/addons/views.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,7 @@ def verify_signature(request):
10041004
uid=data["sender"]["id"], defaults={"name": data["sender"]["login"]}
10051005
)
10061006
if data.get("action") in ["added", "created"]:
1007+
repos = []
10071008
logger.info("[GITHUB WEBHOOK] %s", data["action"])
10081009
installation, _created = GitHubInstallation.objects.get_or_create(
10091010
iid=data["installation"]["id"],
@@ -1022,11 +1023,11 @@ def verify_signature(request):
10221023
with transaction.atomic():
10231024
AddOn.objects.update_or_create(
10241025
repository=repo["full_name"],
1025-
defaults=dict(
1026-
github_account=acct,
1027-
github_installation=installation,
1028-
removed=False,
1029-
),
1026+
defaults={
1027+
"github_account": acct,
1028+
"github_installation": installation,
1029+
"removed": False,
1030+
},
10301031
)
10311032
transaction.on_commit(
10321033
lambda r=repo: update_config.delay(r["full_name"])
@@ -1165,7 +1166,7 @@ def get(self, request, *args, **kwargs):
11651166
url += "/"
11661167
url += kwargs.get("path", "")
11671168

1168-
response = requests.get(url)
1169+
response = requests.get(url, timeout=10)
11691170
return HttpResponse(
11701171
content=response.content,
11711172
status=response.status_code,

documentcloud/common/environment/aws/processing_token.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def authenticate_token(*args, **kwargs):
1717
headers = event["headers"]
1818

1919
if headers.get(AUTHORIZATION) != f"processing-token {PROCESSING_TOKEN}":
20-
raise Exception("Authentication Failed.")
20+
raise PermissionError("Authentication Failed.")
2121

2222
# If all passes, auth succeeded
2323
return func(*args, **kwargs)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# pylint: disable=unused-import
1+
# pylint: disable=unused-import, import-error
22

33
# Third Party
44
from common import session as httpsub

documentcloud/documents/models/document.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,7 @@ def invalidate_cache(self):
744744
"X-Auth-Email": cloudflare_email,
745745
"X-Auth-Key": cloudflare_key,
746746
},
747+
timeout=10
747748
)
748749

749750
def index_on_commit(self, **kwargs):

documentcloud/documents/search.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ def search(user, query_params):
132132
"hl.weightMatches": settings.SOLR_HL_WEIGHT_MATCHES,
133133
**page_query_data,
134134
}
135+
original_text_query = text_query
135136
if (
136137
settings.SOLR_QUERY_NOTES
137138
and user.is_authenticated
@@ -140,7 +141,6 @@ def search(user, query_params):
140141
):
141142
# turn note queries on for all pro users
142143
# *:* returns all documents, do not enable note queries
143-
original_text_query = text_query
144144
text_query = _add_note_query(text_query, user)
145145
kwargs["uf"] = "* _query_ -projects_edit_access"
146146
query_notes = True

0 commit comments

Comments
 (0)