paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

python: Replace requests.packages.urllib3 alias with urllib3.

Browse Source 
requests stopped vendoring urllib3 in 2.16.0 (2017-05-26).

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2022-01-13 13:02:54 -08:00
committed by Tim Abbott
parent 18aa4f4df4
commit ee71650908
7 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pyproject.toml
View File

@@ -97,6 +97,7 @@ module = [
"tornado.*", "tornado.*",
"twitter.*", "twitter.*",
"two_factor.*", "two_factor.*",
"urllib3.*",
"zxcvbn.*", "zxcvbn.*",
] ]
ignore_missing_imports = true ignore_missing_imports = true

2
tools/fetch-contributor-data
View File

@@ -20,8 +20,8 @@ os.environ["DJANGO_SETTINGS_MODULE"] = "zproject.settings"
import django import django
from django.conf import settings from django.conf import settings
from requests.packages.urllib3.util.retry import Retry
from typing_extensions import TypedDict from typing_extensions import TypedDict
from urllib3.util import Retry
django.setup() django.setup()

2
tools/oneclickapps/prepare_digital_ocean_one_click_app_release.py
View File

@@ -7,7 +7,7 @@ from typing import List
import digitalocean import digitalocean
import zulip import zulip
from requests.adapters import HTTPAdapter from requests.adapters import HTTPAdapter
from requests.packages.urllib3.util.retry import Retry from urllib3.util import Retry
manager = digitalocean.Manager(token=os.environ["DIGITALOCEAN_API_KEY"]) manager = digitalocean.Manager(token=os.environ["DIGITALOCEAN_API_KEY"])
zulip_client = zulip.Client() zulip_client = zulip.Client()

2
zerver/lib/outgoing_http.py
View File

@@ -1,7 +1,7 @@
from typing import Any, Dict, Optional, Union from typing import Any, Dict, Optional, Union
import requests import requests
from requests.packages.urllib3.util.retry import Retry from urllib3.util import Retry
class OutgoingSession(requests.Session): class OutgoingSession(requests.Session):

2
zerver/management/commands/fetch_tor_exit_nodes.py
View File

@@ -4,7 +4,7 @@ from typing import Any, Set
import orjson import orjson
from django.conf import settings from django.conf import settings
from requests.packages.urllib3.util.retry import Retry from urllib3.util import Retry
from zerver.lib.management import ZulipBaseCommand from zerver.lib.management import ZulipBaseCommand
from zerver.lib.outgoing_http import OutgoingSession from zerver.lib.outgoing_http import OutgoingSession

2
zerver/tests/test_outgoing_http.py
View File

@@ -4,7 +4,7 @@ from unittest import mock
import requests import requests
import responses import responses
from requests.packages.urllib3.util.retry import Retry from urllib3.util import Retry
from zerver.lib.outgoing_http import OutgoingSession from zerver.lib.outgoing_http import OutgoingSession
from zerver.lib.test_classes import ZulipTestCase from zerver.lib.test_classes import ZulipTestCase

2
zerver/tornado/django_api.py
View File

@@ -7,7 +7,7 @@ import requests
from django.conf import settings from django.conf import settings
from requests.adapters import ConnectionError, HTTPAdapter from requests.adapters import ConnectionError, HTTPAdapter
from requests.models import PreparedRequest, Response from requests.models import PreparedRequest, Response
from requests.packages.urllib3.util.retry import Retry from urllib3.util import Retry
from zerver.lib.queue import queue_json_publish from zerver.lib.queue import queue_json_publish
from zerver.models import Client, Realm, UserProfile from zerver.models import Client, Realm, UserProfile