update: bring in upstream changes from pyicloud

src/icloudpd/authentication.py

@@ -34,7 +34,7 @@ def authenticate_(
                     client_id=client_id,
                 )
                 break
-            except pyicloud_ipd.exceptions.NoStoredPasswordAvailable:
+            except pyicloud_ipd.exceptions.PyiCloudNoStoredPasswordAvailableException:
                 # Prompt for password if not stored in PyiCloud's keyring
                 password = click.prompt("iCloud Password", hide_input=True)
 

src/icloudpd/base.py

@@ -19,7 +19,7 @@
 from tzlocal import get_localzone
 from pyicloud_ipd import PyiCloudService
 
-from pyicloud_ipd.exceptions import PyiCloudAPIResponseError
+from pyicloud_ipd.exceptions import PyiCloudAPIResponseException
 from pyicloud_ipd.services.photos import PhotoAsset
 
 from icloudpd.authentication import authenticator, TwoStepAuthRequiredError
@@ -788,7 +788,7 @@ def core(
                         logger.error("Unknown library: %s", library)
                         return 1
                 photos = library_object.albums[album]
-            except PyiCloudAPIResponseError as err:
+            except PyiCloudAPIResponseException as err:
                 # For later: come up with a nicer message to the user. For now take the
                 # exception text
                 logger.error("error?? %s", err)

src/pyicloud_ipd/__init__.py

@@ -1,3 +1,4 @@
+"""The pyiCloud library."""
 import logging
 from pyicloud_ipd.base import PyiCloudService
 

src/pyicloud_ipd/base.py

@@ -1,3 +1,4 @@
+"""Library base file."""
 from uuid import uuid1
 import inspect
 import json
@@ -10,11 +11,10 @@
 import getpass
 
 from pyicloud_ipd.exceptions import (
-    PyiCloudConnectionException,
     PyiCloudFailedLoginException,
-    PyiCloudAPIResponseError,
-    PyiCloud2SARequiredError,
-    PyiCloudServiceNotActivatedErrror
+    PyiCloudAPIResponseException,
+    PyiCloud2SARequiredException,
+    PyiCloudServiceNotActivatedException,
 )
 from pyicloud_ipd.services import (
     FindMyiPhoneServiceManager,
@@ -23,10 +23,12 @@
     ContactsService,
     RemindersService,
     PhotosService,
-    AccountService
+    AccountService,
+    DriveService,
 )
 from pyicloud_ipd.utils import get_password_from_keyring
 
+
 LOGGER = logging.getLogger(__name__)
 
 HEADER_DATA = {
@@ -39,13 +41,15 @@
 
 
 class PyiCloudPasswordFilter(logging.Filter):
+    """Password log hider."""
+
     def __init__(self, password):
-        self.password = password
+        super().__init__(password)
 
     def filter(self, record):
         message = record.getMessage()
-        if self.password in message:
-            record.msg = message.replace(self.password, "*" * 8)
+        if self.name in message:
+            record.msg = message.replace(self.name, "*" * 8)
             record.args = []
 
         return True