simplify conditionals

earthaccess/auth.py

@@ -277,11 +277,11 @@ def _netrc(self) -> bool:
             raise FileNotFoundError(f"No .netrc found in {Path.home()}") from err
         except NetrcParseError as err:
             raise NetrcParseError("Unable to parse .netrc") from err
-        if (creds := my_netrc[self.system.edl_hostname]) is not None:
-            username = creds["login"]
-            password = creds["password"]
-        else:
+        if (creds := my_netrc[self.system.edl_hostname]) is None:
             return False
+
+        username = creds["login"]
+        password = creds["password"]
         authenticated = self._get_credentials(username, password)
         if authenticated:
             logger.debug("Using .netrc file for EDL")

earthaccess/search.py

@@ -95,13 +95,15 @@ def __init__(self, auth: Optional[Auth] = None, *args: Any, **kwargs: Any) -> No
         """
         super().__init__(*args, **kwargs)
 
-        if auth and auth.authenticated:
+        self.session = (
             # To search, we need the new bearer tokens from NASA Earthdata
-            self.session = auth.get_session(bearer_token=True)
+            auth.get_session(bearer_token=True)
+            if auth and auth.authenticated
+            else requests.session()
+        )
 
+        if auth:
             self.mode(auth.system.cmr_base_url)
-        else:
-            self.session = requests.sessions.Session()
 
         self._debug = False
 
@@ -452,13 +454,15 @@ class DataGranules(GranuleQuery):
     def __init__(self, auth: Optional[Auth] = None, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
 
-        if auth and auth.authenticated:
+        self.session = (
             # To search, we need the new bearer tokens from NASA Earthdata
-            self.session = auth.get_session(bearer_token=True)
+            auth.get_session(bearer_token=True)
+            if auth and auth.authenticated
+            else requests.session()
+        )
 
+        if auth:
             self.mode(auth.system.cmr_base_url)
-        else:
-            self.session = requests.sessions.Session()
 
         self._debug = False