Manual fixes

Author: mandarons

.yamllint

@@ -62,4 +62,4 @@ rules:
     allowed-values:
       - "on"
       - "true"
-      - "false"
+      - "false"

icloudpy/base.py

@@ -72,7 +72,7 @@ def request(self, method, url, **kwargs):  # pylint: disable=arguments-differ
         if self.service.password_filter not in request_logger.filters:
             request_logger.addFilter(self.service.password_filter)
 
-        request_logger.debug("{} {} {}".format(method, url, kwargs.get("data", "")))
+        request_logger.debug(f"{method} {url} {kwargs.get('data', '')}")
 
         has_retried = kwargs.get("retried")
         kwargs.pop("retried", None)
@@ -89,7 +89,7 @@ def request(self, method, url, **kwargs):  # pylint: disable=arguments-differ
                 )
 
         # Save session_data to file
-        with open(self.service.session_path, "w") as outfile:
+        with open(self.service.session_path, "w", encoding="utf-8") as outfile:
             json.dump(self.service.session_data, outfile)
             LOGGER.debug("Saved session data to file")
 
@@ -222,7 +222,7 @@ def __init__(
         self.user = {"accountName": apple_id, "password": password}
         self.data = {}
         self.params = {}
-        self.client_id = client_id or ("auth-%s" % str(uuid1()).lower())
+        self.client_id = client_id or (f"auth-{str(uuid1()).lower()}")
         self.with_family = with_family
         self.auth_endpoint = auth_endpoint
         self.home_endpoint = home_endpoint
@@ -247,7 +247,7 @@ def __init__(
 
         self.session_data = {}
         try:
-            with open(self.session_path) as session_f:
+            with open(self.session_path, encoding="utf-8") as session_f:
                 self.session_data = json.load(session_f)
         except:  # pylint: disable=bare-except
             LOGGER.info("Session file does not exist")
@@ -259,7 +259,7 @@ def __init__(
         self.session = ICloudPySession(self)
         self.session.verify = verify
         self.session.headers.update(
-            {"Origin": self.home_endpoint, "Referer": "%s/" % self.home_endpoint}
+            {"Origin": self.home_endpoint, "Referer": f"{self.home_endpoint}/"}
         )
 
         cookiejar_path = self.cookiejar_path
@@ -334,7 +334,7 @@ def authenticate(self, force_refresh=False, service=None):
 
             try:
                 self.session.post(
-                    "%s/signin" % self.auth_endpoint,
+                    f"{self.auth_endpoint}/signin",
                     params={"isRememberMeEnabled": "true"},
                     data=json.dumps(data),
                     headers=headers,
@@ -360,7 +360,7 @@ def _authenticate_with_token(self):
 
         try:
             req = self.session.post(
-                "%s/accountLogin" % self.setup_endpoint, data=json.dumps(data)
+                f"{self.setup_endpoint}/accountLogin", data=json.dumps(data)
             )
             self.data = req.json()
         except ICloudPyAPIResponseException as error:
@@ -377,7 +377,7 @@ def _authenticate_with_credentials_service(self, service):
 
         try:
             self.session.post(
-                "%s/accountLogin" % self.setup_endpoint, data=json.dumps(data)
+                f"{self.setup_endpoint}/accountLogin", data=json.dumps(data)
             )
 
             self.data = self._validate_token()
@@ -389,7 +389,7 @@ def _validate_token(self):
         """Checks if the current access token is still valid."""
         LOGGER.debug("Checking session token validity")
         try:
-            req = self.session.post("%s/validate" % self.setup_endpoint, data="null")
+            req = self.session.post(f"{self.setup_endpoint}/validate", data="null")
             LOGGER.debug("Session token is still valid")
             return req.json()
         except ICloudPyAPIResponseException as err:
@@ -453,15 +453,15 @@ def is_trusted_session(self):
     def trusted_devices(self):
         """Returns devices trusted for two-step authentication."""
         request = self.session.get(
-            "%s/listDevices" % self.setup_endpoint, params=self.params
+            f"{self.setup_endpoint}/listDevices", params=self.params
         )
         return request.json().get("devices")
 
     def send_verification_code(self, device):
         """Requests that a verification code is sent to the given device."""
         data = json.dumps(device)
         request = self.session.post(
-            "%s/sendVerificationCode" % self.setup_endpoint,
+            f"{self.setup_endpoint}/sendVerificationCode",
             params=self.params,
             data=data,
         )
@@ -474,7 +474,7 @@ def validate_verification_code(self, device, code):
 
         try:
             self.session.post(
-                "%s/validateVerificationCode" % self.setup_endpoint,
+                f"{self.setup_endpoint}/validateVerificationCode",
                 params=self.params,
                 data=data,
             )
@@ -502,7 +502,7 @@ def validate_2fa_code(self, code):
 
         try:
             self.session.post(
-                "%s/verify/trusteddevice/securitycode" % self.auth_endpoint,
+                f"{self.auth_endpoint}/verify/trusteddevice/securitycode",
                 data=json.dumps(data),
                 headers=headers,
             )
@@ -530,7 +530,7 @@ def trust_session(self):
 
         try:
             self.session.get(
-                "%s/2sv/trust" % self.auth_endpoint,
+                f"{self.auth_endpoint}/2sv/trust",
                 headers=headers,
             )
             self._authenticate_with_token()
@@ -613,7 +613,7 @@ def drive(self):
         return self._drive
 
     def __unicode__(self):
-        return "iCloud API: %s" % self.user.get("accountName")
+        return f"iCloud API: {self.user.get('accountName')}"
 
     def __str__(self):
         as_unicode = self.__unicode__()
@@ -622,4 +622,4 @@ def __str__(self):
         return as_unicode
 
     def __repr__(self):
-        return "<%s>" % str(self)
+        return f"<{str(self)}>"

icloudpy/cmdline.py

@@ -259,13 +259,7 @@ def main(args=None):
                 devices = api.trusted_devices
                 for i, device in enumerate(devices):
                     print(
-                        "    %s: %s"
-                        % (
-                            i,
-                            device.get(
-                                "deviceName", "SMS to %s" % device.get("phoneNumber")
-                            ),
-                        )
+                        f'    {i}: {device.get("deviceName", "SMS to " + device.get("phoneNumber"))}'
                     )
 
                 print("\nWhich device would you like to use?")
@@ -289,9 +283,7 @@ def main(args=None):
             if utils.password_exists_in_keyring(username):
                 utils.delete_password_in_keyring(username)
 
-            message = "Bad username or password for {username}".format(
-                username=username,
-            )
+            message = f"Bad username or password for {username}"
             password = None
 
             failure_count += 1
@@ -319,28 +311,24 @@ def main(args=None):
                 print("-" * 30)
                 print(contents["name"])
                 for key in contents:
-                    print("%20s - %s" % (key, contents[key]))
+                    print(f"{key} - {contents[key]}")
             elif command_line.list:
                 print("-" * 30)
-                print("Name - %s" % contents["name"])
-                print("Display Name  - %s" % contents["deviceDisplayName"])
-                print("Location      - %s" % contents["location"])
-                print("Battery Level - %s" % contents["batteryLevel"])
-                print("Battery Status- %s" % contents["batteryStatus"])
-                print("Device Class  - %s" % contents["deviceClass"])
-                print("Device Model  - %s" % contents["deviceModel"])
+                print(f"Name - {contents['name']}")
+                print(f"Display Name  - {contents['deviceDisplayName']}")
+                print(f"Location      - {contents['location']}")
+                print(f"Battery Level - {contents['batteryLevel']}")
+                print(f"Battery Status- {contents['batteryStatus']}")
+                print(f"Device Class  - {contents['deviceClass']}")
+                print(f"Device Model  - {contents['deviceModel']}")
 
             # Play a Sound on a device
             if command_line.sound:
                 if command_line.device_id:
                     dev.play_sound()
                 else:
                     raise RuntimeError(
-                        "\n\n\t\t%s %s\n\n"
-                        % (
-                            "Sounds can only be played on a singular device.",
-                            DEVICE_ERROR,
-                        )
+                        f"\n\n\t\tSounds can only be played on a singular device. {DEVICE_ERROR}\n\n"
                     )
 
             # Display a Message on the device
@@ -351,11 +339,7 @@ def main(args=None):
                     )
                 else:
                     raise RuntimeError(
-                        "%s %s"
-                        % (
-                            "Messages can only be played on a singular device.",
-                            DEVICE_ERROR,
-                        )
+                        f"Messages can only be played on a singular device. {DEVICE_ERROR}"
                     )
 
             # Display a Silent Message on the device
@@ -368,12 +352,7 @@ def main(args=None):
                     )
                 else:
                     raise RuntimeError(
-                        "%s %s"
-                        % (
-                            "Silent Messages can only be played "
-                            "on a singular device.",
-                            DEVICE_ERROR,
-                        )
+                        f"Silent Messages can only be played on a singular device. {DEVICE_ERROR}"
                     )
 
             # Enable Lost mode
@@ -386,11 +365,7 @@ def main(args=None):
                     )
                 else:
                     raise RuntimeError(
-                        "%s %s"
-                        % (
-                            "Lost Mode can only be activated on a singular device.",
-                            DEVICE_ERROR,
-                        )
+                        f"Lost Mode can only be activated on a singular device. {DEVICE_ERROR}"
                     )
     sys.exit(0)
 

icloudpy/exceptions.py

@@ -5,7 +5,6 @@ class ICloudPyException(Exception):
     """Generic iCloud exception."""
 
 
-
 # API
 class ICloudPyAPIResponseException(ICloudPyException):
     """iCloud response exception."""
@@ -15,7 +14,7 @@ def __init__(self, reason, code=None, retry=False):
         self.code = code
         message = reason or ""
         if code:
-            message += " (%s)" % code
+            message += f" ({code})"
         if retry:
             message += ". Retrying ..."
 
@@ -26,27 +25,23 @@ class ICloudPyServiceNotActivatedException(ICloudPyAPIResponseException):
     """iCloud service not activated exception."""
 
 
-
 # Login
 class ICloudPyFailedLoginException(ICloudPyException):
     """iCloud failed login exception."""
 
 
-
 class ICloudPy2SARequiredException(ICloudPyException):
     """iCloud 2SA required exception."""
 
     def __init__(self, apple_id):
-        message = "Two-step authentication required for account: %s" % apple_id
+        message = f"Two-step authentication required for account:{apple_id}"
         super().__init__(message)
 
 
 class ICloudPyNoStoredPasswordAvailableException(ICloudPyException):
     """iCloud no stored password exception."""
 
 
-
 # Webservice specific
 class ICloudPyNoDevicesException(ICloudPyException):
     """iCloud no device exception."""
-

icloudpy/services/account.py

@@ -18,12 +18,13 @@ def __init__(self, service_root, session, params):
         self._family = []
         self._storage = None
 
-        self._acc_endpoint = "%s/setup/web" % self._service_root
-        self._acc_devices_url = "%s/device/getDevices" % self._acc_endpoint
-        self._acc_family_details_url = "%s/family/getFamilyDetails" % self._acc_endpoint
+        self._acc_endpoint = f"{self._service_root}/setup/web"
+        self._acc_devices_url = f"{self._acc_endpoint}/device/getDevices"
+        self._acc_family_details_url = f"{self._acc_endpoint}/family/getFamilyDetails"
         self._acc_family_member_photo_url = (
-            "%s/family/getMemberPhoto" % self._acc_endpoint
+            f"{self._acc_endpoint}/family/getMemberPhoto"
         )
+
         self._acc_storage_url = "https://setup.icloud.com/setup/ws/1/storageUsageInfo"
 
     @property
@@ -69,11 +70,8 @@ def storage(self):
         return self._storage
 
     def __unicode__(self):
-        return "{{devices: {}, family: {}, storage: {} bytes free}}".format(
-            len(self.devices),
-            len(self.family),
-            self.storage.usage.available_storage_in_bytes,
-        )
+        return f"{{devices: {len(self.devices)}, family: {len(self.family)}, \
+            storage: {self.storage.usage.available_storage_in_bytes} bytes free}}"
 
     def __str__(self):
         as_unicode = self.__unicode__()
@@ -207,9 +205,8 @@ def __getitem__(self, key):
         return getattr(self, key)
 
     def __unicode__(self):
-        return "{{name: {}, age_classification: {}}}".format(
-            self.full_name,
-            self.age_classification,
+        return (
+            f"{{name: {self.full_name}, age_classification: {self.age_classification}}}"
         )
 
     def __str__(self):
@@ -326,10 +323,7 @@ def quota_paid(self):
         return self.quota_data["paidQuota"]
 
     def __unicode__(self):
-        return "{}% used of {} bytes".format(
-            self.used_storage_in_percent,
-            self.total_storage_in_bytes,
-        )
+        return f"{self.used_storage_in_percent}% used of {self.total_storage_in_bytes} bytes"
 
     def __str__(self):
         as_unicode = self.__unicode__()

icloudpy/services/calendar.py

@@ -14,10 +14,10 @@ def __init__(self, service_root, session, params):
         self.session = session
         self.params = params
         self._service_root = service_root
-        self._calendar_endpoint = "%s/ca" % self._service_root
-        self._calendar_refresh_url = "%s/events" % self._calendar_endpoint
-        self._calendar_event_detail_url = "%s/eventdetail" % self._calendar_endpoint
-        self._calendars = "%s/startup" % self._calendar_endpoint
+        self._calendar_endpoint = f"{self._service_root}/ca"
+        self._calendar_refresh_url = f"{self._calendar_endpoint}/events"
+        self._calendar_event_detail_url = f"{self._calendar_endpoint}/eventdetail"
+        self._calendars = f"{self._calendar_endpoint}/startup"
 
         self.response = {}
 

icloudpy/services/contacts.py

@@ -10,10 +10,10 @@ def __init__(self, service_root, session, params):
         self.session = session
         self.params = params
         self._service_root = service_root
-        self._contacts_endpoint = "%s/co" % self._service_root
-        self._contacts_refresh_url = "%s/startup" % self._contacts_endpoint
-        self._contacts_next_url = "%s/contacts" % self._contacts_endpoint
-        self._contacts_changeset_url = "%s/changeset" % self._contacts_endpoint
+        self._contacts_endpoint = f"{self._service_root}/co"
+        self._contacts_refresh_url = f"{self._contacts_endpoint}/startup"
+        self._contacts_next_url = f"{self._contacts_endpoint}/contacts"
+        self._contacts_changeset_url = f"{self._contacts_endpoint}/changeset"
 
         self.response = {}