Merge pull request #63 from ericbn/simplify_is_none

Simplify usage of ternary operator
forcedotcom · Sep 7, 2023 · cfc3f4f · cfc3f4f
2 parents 219e497 + 704f4a5
commit cfc3f4f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/SalesforcePy/commons.py b/SalesforcePy/commons.py
@@ -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):
@@ -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):
@@ -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
diff --git a/SalesforcePy/sfdc.py b/SalesforcePy/sfdc.py
@@ -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):