Revert "Apply code formatting with tox -e ruff as requested in review feedback"

This reverts commit 673b9a1.

Author: SashankBhamidi

bootstrap.py

@@ -22,6 +22,7 @@
 import shutil
 import sys
 import tempfile
+
 from optparse import OptionParser
 
 tmpeggs = tempfile.mkdtemp()
@@ -59,7 +60,7 @@
 parser.add_option(
     "-c",
     "--config-file",
-    help=("Specify the path to the buildout configuration file to be used."),
+    help=("Specify the path to the buildout configuration " "file to be used."),
 )
 parser.add_option(
     "-f", "--find-links", help=("Specify a URL to search for buildout releases")
@@ -79,8 +80,8 @@
 
 try:
     if options.allow_site_packages:
-        import pkg_resources
         import setuptools
+        import pkg_resources
     from urllib.request import urlopen
 except ImportError:
     from urllib2 import urlopen
@@ -102,8 +103,8 @@
 
 setup_args = {"to_dir": tmpeggs, "download_delay": 0}
 ez["use_setuptools"](**setup_args)
-import pkg_resources
 import setuptools
+import pkg_resources
 
 # This does not (always?) update the default working set.  We will
 # do it.
@@ -171,13 +172,13 @@ def _final_version(parsed_version):
             best.sort()
             version = best[-1].version
 if version:
-    requirement = f"{requirement}=={version}"
+    requirement = "==".join((requirement, version))
 cmd.append(requirement)
 
 import subprocess
 
 if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0:
-    raise Exception(f"Failed to execute command:\n{repr(cmd)[1:-1]}")
+    raise Exception("Failed to execute command:\n%s" % repr(cmd)[1:-1])
 
 ######################################################################
 # Import and run buildout

src/icalendar/alarms.py

@@ -14,7 +14,7 @@
 from __future__ import annotations
 
 from datetime import date, timedelta, tzinfo
-from typing import TYPE_CHECKING, Generator, Union
+from typing import TYPE_CHECKING, Generator, Optional, Union
 
 from icalendar.cal.event import Event
 from icalendar.cal.todo import Todo
@@ -42,9 +42,9 @@ def __init__(
         self,
         alarm: Alarm,
         trigger: datetime,
-        acknowledged_until: datetime | None = None,
-        snoozed_until: datetime | None = None,
-        parent: Parent | None = None,
+        acknowledged_until: Optional[datetime] = None,
+        snoozed_until: Optional[datetime] = None,
+        parent: Optional[Parent] = None,
     ):
         """Create a new AlarmTime.
 
@@ -75,7 +75,7 @@ def __init__(
         self._snooze_until = snoozed_until
 
     @property
-    def acknowledged(self) -> datetime | None:
+    def acknowledged(self) -> Optional[datetime]:
         """The time in UTC at which this alarm was last acknowledged.
 
         If the alarm was not acknowledged (dismissed), then this is None.
@@ -93,7 +93,7 @@ def alarm(self) -> Alarm:
         return self._alarm
 
     @property
-    def parent(self) -> Parent | None:
+    def parent(self) -> Optional[Parent]:
         """This is the component that contains the alarm.
 
         This is None if you did not use Alarms.set_component().
@@ -178,17 +178,17 @@ class Alarms:
     This is not implemented yet.
     """
 
-    def __init__(self, component: Alarm | Event | Todo | None = None):
+    def __init__(self, component: Optional[Alarm | Event | Todo] = None):
         """Start computing alarm times."""
         self._absolute_alarms: list[Alarm] = []
         self._start_alarms: list[Alarm] = []
         self._end_alarms: list[Alarm] = []
-        self._start: date | None = None
-        self._end: date | None = None
-        self._parent: Parent | None = None
-        self._last_ack: datetime | None = None
-        self._snooze_until: datetime | None = None
-        self._local_tzinfo: tzinfo | None = None
+        self._start: Optional[date] = None
+        self._end: Optional[date] = None
+        self._parent: Optional[Parent] = None
+        self._last_ack: Optional[datetime] = None
+        self._snooze_until: Optional[datetime] = None
+        self._local_tzinfo: Optional[tzinfo] = None
 
         if component is not None:
             self.add_component(component)
@@ -234,15 +234,15 @@ def add_alarm(self, alarm: Alarm) -> None:
         else:
             self._end_alarms.append(alarm)
 
-    def set_start(self, dt: date | None):
+    def set_start(self, dt: Optional[date]):
         """Set the start of the component.
 
         If you have only absolute alarms, this is not required.
         If you have alarms relative to the start of a compoment, set the start here.
         """
         self._start = dt
 
-    def set_end(self, dt: date | None):
+    def set_end(self, dt: Optional[date]):
         """Set the end of the component.
 
         If you have only absolute alarms, this is not required.
@@ -258,7 +258,7 @@ def _add(self, dt: date, td: timedelta):
             dt = to_datetime(dt)
         return normalize_pytz(dt + td)
 
-    def acknowledge_until(self, dt: date | None) -> None:
+    def acknowledge_until(self, dt: Optional[date]) -> None:
         """This is the time in UTC when all the alarms of this component were acknowledged.
 
         Only the last call counts.
@@ -271,7 +271,7 @@ def acknowledge_until(self, dt: date | None) -> None:
         """
         self._last_ack = tzp.localize_utc(dt) if dt is not None else None
 
-    def snooze_until(self, dt: date | None) -> None:
+    def snooze_until(self, dt: Optional[date]) -> None:
         """This is the time in UTC when all the alarms of this component were snoozed.
 
         Only the last call counts.
@@ -281,7 +281,7 @@ def snooze_until(self, dt: date | None) -> None:
         """
         self._snooze_until = tzp.localize_utc(dt) if dt is not None else None
 
-    def set_local_timezone(self, tzinfo: tzinfo | str | None):
+    def set_local_timezone(self, tzinfo: Optional[tzinfo | str]):
         """Set the local timezone.
 
         Events are sometimes in local time.

src/icalendar/attr.py

@@ -311,7 +311,7 @@ def _get_rrules(self: Component) -> list[vRecur]:
 
 
 def multi_language_text_property(
-    main_prop: str, compatibility_prop: str | None, doc: str
+    main_prop: str, compatibility_prop: Optional[str], doc: str
 ) -> property:
     """This creates a text property.
 
@@ -323,7 +323,7 @@ def multi_language_text_property(
         doc (str): The documentation string
     """
 
-    def fget(self: Component) -> str | None:
+    def fget(self: Component) -> Optional[str]:
         """Get the property"""
         result = self.get(main_prop)
         if result is None and compatibility_prop is not None:
@@ -334,7 +334,7 @@ def fget(self: Component) -> str | None:
                     return item
         return result
 
-    def fset(self: Component, value: str | None):
+    def fset(self: Component, value: Optional[str]):
         """Set the property."""
         fdel(self)
         if value is not None:
@@ -365,7 +365,7 @@ def fget(self: Component) -> int:
         except ValueError as e:
             raise InvalidCalendar(f"{prop} must be an int") from e
 
-    def fset(self: Component, value: int | None):
+    def fset(self: Component, value: Optional[int]):
         """Set the property."""
         fdel(self)
         if value is not None:
@@ -393,7 +393,7 @@ def single_utc_property(name: str, docs: str) -> property:
         + docs
     )
 
-    def fget(self: Component) -> datetime | None:
+    def fget(self: Component) -> Optional[datetime]:
         """Get the value."""
         if name not in self:
             return None
@@ -407,7 +407,7 @@ def fget(self: Component) -> datetime | None:
             raise InvalidCalendar(f"{name} must be a datetime in UTC, not {value}")
         return tzp.localize_utc(value)
 
-    def fset(self: Component, value: datetime | None):
+    def fset(self: Component, value: Optional[datetime]):
         """Set the value"""
         if value is None:
             fdel(self)
@@ -425,7 +425,7 @@ def fdel(self: Component):
 
 
 def single_string_property(
-    name: str, docs: str, other_name: str | None = None, default: str = ""
+    name: str, docs: str, other_name: Optional[str] = None, default: str = ""
 ) -> property:
     """Create a property to access a single string value."""
 
@@ -440,7 +440,7 @@ def fget(self: Component) -> str:
             return result[0]
         return result
 
-    def fset(self: Component, value: str | None):
+    def fset(self: Component, value: Optional[str]):
         """Set the value.
 
         Setting the value to None will delete it.
@@ -560,7 +560,7 @@ def fdel(self: Component):
 
 def _get_categories(component: Component) -> list[str]:
     """Get all the categories."""
-    categories: vCategory | list[vCategory] | None = component.get("CATEGORIES")
+    categories: Optional[vCategory | list[vCategory]] = component.get("CATEGORIES")
     if isinstance(categories, list):
         _set_categories(
             component,
@@ -573,7 +573,7 @@ def _get_categories(component: Component) -> list[str]:
     return categories.cats
 
 
-def _set_categories(component: Component, cats: Sequence[str] | None) -> None:
+def _set_categories(component: Component, cats: Optional[Sequence[str]]) -> None:
     """Set the categories."""
     if not cats and cats != []:
         _del_categories(component)
@@ -871,7 +871,7 @@ def _del_attendees(self: Component):
 
 def create_single_property(
     prop: str,
-    value_attr: str | None,
+    value_attr: Optional[str],
     value_type: tuple[type],
     type_def: type,
     doc: str,
@@ -945,7 +945,7 @@ def p_del(self: Component):
 )
 
 
-def property_get_duration(self: Component) -> timedelta | None:
+def property_get_duration(self: Component) -> Optional[timedelta]:
     """Getter for property DURATION."""
     default = object()
     duration = self.get("duration", default)
@@ -960,7 +960,7 @@ def property_get_duration(self: Component) -> timedelta | None:
     return None
 
 
-def property_set_duration(self: Component, value: timedelta | None):
+def property_set_duration(self: Component, value: Optional[timedelta]):
     """Setter for property DURATION."""
     if value is None:
         self.pop("duration", None)
@@ -1015,7 +1015,7 @@ def fget(self: Component) -> list[str]:
             return [descriptions]
         return descriptions
 
-    def fset(self: Component, values: str | Sequence[str] | None):
+    def fset(self: Component, values: Optional[str | Sequence[str]]):
         """Set the values."""
         fdel(self)
         if values is None:
@@ -1087,7 +1087,7 @@ def fdel(self: Component):
 )
 
 
-def _get_organizer(self: Component) -> vCalAddress | None:
+def _get_organizer(self: Component) -> Optional[vCalAddress]:
     """ORGANIZER defines the organizer for a calendar component.
 
     Property Parameters:
@@ -1126,7 +1126,7 @@ def _get_organizer(self: Component) -> vCalAddress | None:
     return self.get("ORGANIZER")
 
 
-def _set_organizer(self: Component, value: vCalAddress | str | None):
+def _set_organizer(self: Component, value: Optional[vCalAddress | str]):
     """Set the value."""
     _del_organizer(self)
     if value is not None:
@@ -1448,7 +1448,7 @@ def timezone_datetime_property(name: str, docs: str):
 
 
 @property
-def rfc_7953_duration_property(self) -> timedelta | None:
+def rfc_7953_duration_property(self) -> Optional[timedelta]:
     """Compute the duration of this component.
 
     If there is no :attr:`DTEND` or :attr:`DURATION` set, this is None.
@@ -1471,7 +1471,7 @@ def rfc_7953_duration_property(self) -> timedelta | None:
 
 
 @property
-def rfc_7953_end_property(self) -> timedelta | None:
+def rfc_7953_end_property(self) -> Optional[timedelta]:
     """Compute the duration of this component.
 
     If there is no :attr:`DTEND` or :attr:`DURATION` set, this is None.

src/icalendar/cal/alarm.py

@@ -246,10 +246,10 @@ def triggers(self):
     def new(
         cls,
         /,
-        attendees: list[vCalAddress] | None = None,
-        description: str | None = None,
-        summary: str | None = None,
-        uid: str | uuid.UUID | None = None,
+        attendees: Optional[list[vCalAddress]] = None,
+        description: Optional[str] = None,
+        summary: Optional[str] = None,
+        uid: Optional[str | uuid.UUID] = None,
     ):
         """Create a new alarm with all required properties.
 

src/icalendar/cal/availability.py

@@ -7,7 +7,7 @@
 
 import uuid
 from datetime import datetime
-from typing import TYPE_CHECKING, Sequence
+from typing import TYPE_CHECKING, Optional, Sequence
 
 from icalendar.attr import (
     busy_type_property,
@@ -234,25 +234,25 @@ def available(self) -> list[Available]:
     def new(
         cls,
         /,
-        busy_type: BUSYTYPE | None = None,
+        busy_type: Optional[BUSYTYPE] = None,
         categories: Sequence[str] = (),
         comments: list[str] | str | None = None,
         components: Sequence[Available] | None = (),
         contacts: list[str] | str | None = None,
-        created: date | None = None,
-        classification: CLASS | None = None,
-        description: str | None = None,
-        end: datetime | None = None,
-        last_modified: date | None = None,
-        location: str | None = None,
-        organizer: vCalAddress | str | None = None,
-        priority: int | None = None,
-        sequence: int | None = None,
-        stamp: date | None = None,
-        start: datetime | None = None,
-        summary: str | None = None,
-        uid: str | uuid.UUID | None = None,
-        url: str | None = None,
+        created: Optional[date] = None,
+        classification: Optional[CLASS] = None,
+        description: Optional[str] = None,
+        end: Optional[datetime] = None,
+        last_modified: Optional[date] = None,
+        location: Optional[str] = None,
+        organizer: Optional[vCalAddress | str] = None,
+        priority: Optional[int] = None,
+        sequence: Optional[int] = None,
+        stamp: Optional[date] = None,
+        start: Optional[datetime] = None,
+        summary: Optional[str] = None,
+        uid: Optional[str | uuid.UUID] = None,
+        url: Optional[str] = None,
     ):
         """Create a new event with all required properties.