From 8976be7f5c470645dcd8a6e3f34b9e498974b994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <tomas@imaniti.org>
Date: Wed, 21 Feb 2024 11:13:46 +0100
Subject: [PATCH] fix import names
---
calendar_utils/icalevents/icaldownload.py | 3 ++-
calendar_utils/icalevents/icalevents.py | 3 +--
calendar_utils/icalevents/icalparser.py | 14 ++++++++------
.../migrations/0004_auto_20220505_1228.py | 2 +-
calendar_utils/models.py | 2 +-
calendar_utils/parser.py | 2 +-
tests/calendar_utils/conftest.py | 3 ++-
tests/calendar_utils/test_parser.py | 2 +-
8 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/calendar_utils/icalevents/icaldownload.py b/calendar_utils/icalevents/icaldownload.py
index 6aadeddb..bdc3262d 100644
--- a/calendar_utils/icalevents/icaldownload.py
+++ b/calendar_utils/icalevents/icaldownload.py
@@ -1,9 +1,10 @@
"""
Downloads an iCal url or reads an iCal file.
"""
-from httplib2 import Http
import logging
+from httplib2 import Http
+
def apple_data_fix(content):
"""
diff --git a/calendar_utils/icalevents/icalevents.py b/calendar_utils/icalevents/icalevents.py
index 91ac0e2d..9e834f34 100644
--- a/calendar_utils/icalevents/icalevents.py
+++ b/calendar_utils/icalevents/icalevents.py
@@ -1,8 +1,7 @@
from threading import Lock, Thread
-from .icalparser import parse_events, Event
from .icaldownload import ICalDownload
-
+from .icalparser import Event, parse_events
# Lock for event data
event_lock = Lock()
diff --git a/calendar_utils/icalevents/icalparser.py b/calendar_utils/icalevents/icalparser.py
index 80161afc..71198fe2 100644
--- a/calendar_utils/icalevents/icalparser.py
+++ b/calendar_utils/icalevents/icalparser.py
@@ -1,19 +1,18 @@
"""
Parse iCal data to Events.
"""
+from datetime import date, datetime, timedelta
+
# for UID generation
from faulthandler import is_enabled
from random import randint
-from datetime import datetime, timedelta, date, tzinfo
from typing import Optional
+from uuid import uuid4
from dateutil.rrule import rrulestr
from dateutil.tz import UTC, gettz
-
from icalendar import Calendar
from icalendar.prop import vDDDLists, vText
-from uuid import uuid4
-
from icalendar.windows_to_olson import WINDOWS_TO_OLSON
from pytz import timezone
@@ -107,7 +106,6 @@ class Event:
return "%s: %s (%s)" % (self.start, self.summary, self.end - self.start)
def astimezone(self, tzinfo):
-
if type(self.start) is datetime:
self.start = self.start.astimezone(tzinfo)
@@ -244,7 +242,11 @@ def create_event(component, utc_default):
if component.get("categories"):
categoriesval = component.get("categories")
- categories = component.get("categories").cats if hasattr(categoriesval, "cats") else categoriesval
+ categories = (
+ component.get("categories").cats
+ if hasattr(categoriesval, "cats")
+ else categoriesval
+ )
encoded_categories = list()
for category in categories:
encoded_categories.append(encode(category))
diff --git a/calendar_utils/migrations/0004_auto_20220505_1228.py b/calendar_utils/migrations/0004_auto_20220505_1228.py
index 62f0bfa4..5b5021f7 100644
--- a/calendar_utils/migrations/0004_auto_20220505_1228.py
+++ b/calendar_utils/migrations/0004_auto_20220505_1228.py
@@ -3,8 +3,8 @@ from datetime import date, timedelta
import arrow
from django.db import migrations
-from icalevents import icalevents
+from calendar_utils.icalevents import icalevents
from calendar_utils.parser import process_event_list
diff --git a/calendar_utils/models.py b/calendar_utils/models.py
index c19a40d5..d7b54e9b 100644
--- a/calendar_utils/models.py
+++ b/calendar_utils/models.py
@@ -8,8 +8,8 @@ from django.core.serializers.json import DjangoJSONEncoder
from django.core.validators import URLValidator, ValidationError
from django.db import models, transaction
from django.utils.timezone import now
-from icalevents import icalevents
+from .icalevents import icalevents
from .parser import process_event_list
from .tasks import update_calendar_source
diff --git a/calendar_utils/parser.py b/calendar_utils/parser.py
index 7698207b..1ae18f19 100644
--- a/calendar_utils/parser.py
+++ b/calendar_utils/parser.py
@@ -8,7 +8,7 @@ from django.conf import settings
from django.utils.timezone import is_naive
if TYPE_CHECKING:
- from icalevents.icalparser import Event
+ from .icalevents.icalparser import Event
EVENT_KEYS = ("start", "end", "all_day", "summary", "description", "location", "url")
diff --git a/tests/calendar_utils/conftest.py b/tests/calendar_utils/conftest.py
index f8241f1b..da268dc5 100644
--- a/tests/calendar_utils/conftest.py
+++ b/tests/calendar_utils/conftest.py
@@ -3,7 +3,8 @@ from datetime import datetime
from pathlib import Path
import pytest
-from icalevents.icalparser import Event
+
+from calendar_utils.icalevents.icalparser import Event
@pytest.fixture(scope="session")
diff --git a/tests/calendar_utils/test_parser.py b/tests/calendar_utils/test_parser.py
index b4f9a074..8a98051f 100644
--- a/tests/calendar_utils/test_parser.py
+++ b/tests/calendar_utils/test_parser.py
@@ -1,8 +1,8 @@
from datetime import datetime
import pytest
-from icalevents.icalparser import Event
+from calendar_utils.icalevents.icalparser import Event
from calendar_utils.parser import (
process_event_list,
set_event_duration,
--
GitLab