xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

api: Use requests.Session.

Browse source 
Using requests.Session allows the requests library to reuse HTTP
connections, which is potentially helpful for performance.

Fixes #3.
This commit is contained in:
Alex Dehnert 2017-07-18 03:36:07 -04:00 committed by Tim Abbott
parent 749356d34b
commit 5eaac7bfba
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
zulip/zulip/__init__.py
View file

@ -342,6 +342,30 @@ class Client(object):
self.client_cert = client_cert
self.client_cert_key = client_cert_key
self.session = None # type: Union[None, requests.Session]
def ensure_session(self):
# type: () -> None
# Check if the session has been created already, and return
# immediately if so.
if self.session:
return
# Build a client cert object for requests
if self.client_cert_key is not None:
client_cert = (self.client_cert, self.client_cert_key) # type: Union[str, Tuple[str, str]]
else:
client_cert = self.client_cert
# Actually construct the session
session = requests.Session()
session.auth = requests.auth.HTTPBasicAuth(self.email, self.api_key) # type: ignore # https://github.com/python/typeshed/pull/1504
session.verify = self.tls_verification # type: ignore # https://github.com/python/typeshed/pull/1504
session.cert = client_cert
session.headers = {"User-agent": self.get_user_agent()}
self.session = session
def get_user_agent(self):
# type: () -> str
vendor = ''
@ -384,6 +408,8 @@ class Client(object):
for f in files:
req_files.append((f.name, f))
self.ensure_session()
query_state = {
'had_error_retry': False,
'request': request,
@ -427,21 +453,10 @@ class Client(object):
if files:
kwargs['files'] = req_files
# Build a client cert object for requests
if self.client_cert_key is not None:
client_cert = (self.client_cert, self.client_cert_key) # type: Union[str, Tuple[str, str]]
else:
client_cert = self.client_cert
res = requests.request(
res = self.session.request(
method,
urllib.parse.urljoin(self.base_url, url),
auth=requests.auth.HTTPBasicAuth(self.email,
self.api_key),
verify=self.tls_verification,
cert=client_cert,
timeout=90,
headers={"User-agent": self.get_user_agent()},
**kwargs)
# On 50x errors, try again after a short sleep