Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify usage of ternary operator #63

Merged
merged 3 commits into from
Sep 7, 2023
Merged

Simplify usage of ternary operator #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca2cdc9
Simplify usage of ternary operator
ericbn Mar 8, 2023
71ad344
Refactor if else to ternary operator
ericbn Mar 9, 2023
704f4a5
Merge branch 'master' into simplify_is_none
caffalaughrey Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions SalesforcePy/commons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ def get_request_url(self):
:return: request_url
:rtype: string
"""
self.request_url = 'https://%s%s' % (self.instance_url,
self.service) if self.request_url is None else self.request_url
if self.request_url is None:
self.request_url = 'https://%s%s' % (self.instance_url, self.service)
return self.request_url

def get_headers(self):
Expand All @@ -194,11 +194,12 @@ def get_headers(self):
:return: headers
:rtype: dict
"""
self.headers = {
'Content-Type': 'application/json',
'Accept-Encoding': 'application/json',
'Authorization': 'OAuth %s' %
self.session_id} if self.headers is None else self.headers
if self.headers is None:
self.headers = {
'Content-Type': 'application/json',
'Accept-Encoding': 'application/json',
'Authorization': 'OAuth %s' % self.session_id
}
return self.headers

def get_request_vars(self):
Expand Down Expand Up @@ -290,7 +291,7 @@ def request(self):
return response

def get_request_url(self):
url = self.instance_url if self.login_url is None else self.login_url
self.request_url = 'https://%s%s' % (
url, self.service) if self.request_url is None else self.request_url
if self.request_url is None:
url = self.login_url or self.instance_url
self.request_url = 'https://%s%s' % (url, self.service)
return self.request_url
6 changes: 1 addition & 5 deletions SalesforcePy/sfdc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,7 @@ def __init__(self, session_id, instance_url, **kwargs):
**kwargs)

self.service = APPROVAL_SERVICE % self.api_version

if self.request_body is None:
self.http_method = 'GET'
elif self.request_body is not None:
self.http_method = 'POST'
self.http_method = 'GET' if self.request_body is None else 'POST'


class Client(object):
Expand Down