diff options
| author | dabrows <piotr.dabrowski@htw-berln.de> | 2023-12-18 21:16:27 +0100 |
|---|---|---|
| committer | Christian Geier <geier@lostpackets.de> | 2024-04-28 01:00:26 +0200 |
| commit | b0eb57ebca7632ba0557a3153690ab1ede9f2eac (patch) | |
| tree | fbc8ec4591f182ccb0d96bc35a82320c915cfe4d | |
| parent | 9d4043897f7cb366c82dd3d0d670f52a4ccb9bc2 (diff) | |
Added adherence to mypy requirements
| -rw-r--r-- | khal/khalendar/event.py | 8 | ||||
| -rw-r--r-- | khal/khalendar/khalendar.py | 10 | ||||
| -rw-r--r-- | tests/event_test.py | 6 |
3 files changed, 13 insertions, 11 deletions
diff --git a/khal/khalendar/event.py b/khal/khalendar/event.py index ec1d41a6..4a6dbb96 100644 --- a/khal/khalendar/event.py +++ b/khal/khalendar/event.py @@ -523,21 +523,21 @@ class Event: def update_attendees(self, attendees: List[str]): assert isinstance(attendees, list) - attendees = [Attendee(a) for a in attendees if a != ""] - if len(attendees) > 0: + attendees_o : List[Attendee] = [Attendee(a) for a in attendees if a != ""] + if len(attendees_o) > 0: # first check for overlaps in existing attendees. # Existing vCalAddress objects will be copied, non-existing # vCalAddress objects will be created and appended. old_attendees = self._vevents[self.ref].get('ATTENDEE', []) unchanged_attendees = [] vCalAddresses = [] - for attendee in attendees: + for attendee in attendees_o: for old_attendee in old_attendees: old_email = old_attendee.lstrip("MAILTO:").lower() if attendee.mail == old_email: vCalAddresses.append(old_attendee) unchanged_attendees.append(attendee) - for attendee in [a for a in attendees if a not in unchanged_attendees]: + for attendee in [a for a in attendees_o if a not in unchanged_attendees]: item = icalendar.prop.vCalAddress(f'MAILTO:{attendee.mail}') if attendee.cn is not None: item.params['CN'] = attendee.cn diff --git a/khal/khalendar/khalendar.py b/khal/khalendar/khalendar.py index d4500a4d..6b28f3c0 100644 --- a/khal/khalendar/khalendar.py +++ b/khal/khalendar/khalendar.py @@ -101,7 +101,7 @@ class CalendarCollection: self.hmethod = hmethod self.default_color = default_color - self.default_contacts = [] + self.default_contacts : List[str] = [] self.multiple = multiple self.multiple_on_overflow = multiple_on_overflow self.color = color @@ -112,8 +112,8 @@ class CalendarCollection: self._backend = backend.SQLiteDb(self.names, dbpath, self._locale) self._last_ctags: Dict[str, str] = {} self.update_db() - for calendar in self._calendars.keys(): - self._contacts_update(calendar) + for cname in self._calendars.keys(): + self._contacts_update(cname) @property def writable_names(self) -> List[str]: @@ -369,9 +369,9 @@ class CalendarCollection: return local_ctag != self._backend.get_ctag(calendar) def _contacts_update(self, calendar: str) -> None: - adaptercommand = self._calendars[calendar].get('address_adapter') - if adaptercommand is None: + if self._calendars[calendar].get('address_adapter') is None: self._contacts[calendar] = [] + adaptercommand = str(self._calendars[calendar].get('address_adapter')) if adaptercommand == "default": self._contacts[calendar] = self.default_contacts else: diff --git a/tests/event_test.py b/tests/event_test.py index 2afc465b..96baa6b2 100644 --- a/tests/event_test.py +++ b/tests/event_test.py @@ -545,7 +545,8 @@ def test_event_attendees(): assert str(event._vevents[event.ref].get('ATTENDEE', [])[0]) == "MAILTO:this-does@not-exist.de" event.update_attendees(["this-does@not-exist.de", "also-does@not-exist.de"]) - assert event.attendees == "this-does@not-exist.de <this-does@not-exist.de>, also-does@not-exist.de <also-does@not-exist.de>" + assert event.attendees == "this-does@not-exist.de <this-does@not-exist.de>, " \ + "also-does@not-exist.de <also-does@not-exist.de>" assert isinstance(event._vevents[event.ref].get('ATTENDEE', []), list) assert len(event._vevents[event.ref].get('ATTENDEE', [])) == 2 @@ -561,7 +562,8 @@ def test_event_attendees(): ) event._vevents[event.ref]['ATTENDEE'] = [new_address, ] event.update_attendees(["another.mailaddress@not-exist.de", "mail.address@not-exist.de"]) - assert event.attendees == "Real Name <mail.address@not-exist.de>, another.mailaddress@not-exist.de <another.mailaddress@not-exist.de>" + assert event.attendees == "Real Name <mail.address@not-exist.de>, "\ + "another.mailaddress@not-exist.de <another.mailaddress@not-exist.de>" address = [a for a in event._vevents[event.ref].get('ATTENDEE', []) if str(a) == "MAILTO:mail.address@not-exist.de"] assert len(address) == 1 |