reproduce #836

.gitignore

@@ -15,6 +15,7 @@ doc/source/configspec.rst
 .mypy_cache/
 .env
 .venv
+.venv*
 env/
 venv/
 .hypothesis/

khal/cli.py

@@ -400,13 +400,22 @@ def printcalendars(ctx, include_calendar, exclude_calendar):
 
 @cli.command()
 @click.pass_context
-def printformats(ctx):
+@click.option(
+    '--now',
+    help=('Print the current date and time in the local timezone instead.'),
+    is_flag=True,
+)
+def printformats(ctx, now: bool):
     '''Print a date in all formats.
 
     Print the date 2013-12-21 21:45 in all configured date(time)
     formats to check if these locale settings are configured to ones
     liking.'''
     time = dt.datetime(2013, 12, 21, 21, 45)
+    if now:
+        import pytz
+        time = dt.datetime.utcnow()
+        time = pytz.UTC.localize(time).astimezone(ctx.obj['conf']['locale']['local_timezone'])
     try:
         for strftime_format in [
                 'longdatetimeformat', 'datetimeformat', 'longdateformat',

khal/controllers.py

@@ -27,7 +27,7 @@
 import textwrap
 from collections import OrderedDict, defaultdict
 from shutil import get_terminal_size
-from typing import Callable, List, Optional
+from typing import Callable, List, Optional, Tuple
 
 import pytz
 from click import confirm, echo, prompt, style
@@ -62,7 +62,7 @@ def format_day(day: dt.date, format_string: str, locale, attributes=None):
     attributes["date"] = day.strftime(locale['dateformat'])
     attributes["date-long"] = day.strftime(locale['longdateformat'])
 
-    attributes["name"] = parse_datetime.construct_daynames(day)
+    attributes["name"] = parse_datetime.construct_daynames(day, timezone=locale['local_timezone'])
 
     colors = {"reset": style("", reset=True), "bold": style("", bold=True, reset=False)}
     for c in ["black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"]:
@@ -148,7 +148,7 @@ def start_end_from_daterange(
     locale: LocaleConfiguration,
     default_timedelta_date: dt.timedelta=dt.timedelta(days=1),
     default_timedelta_datetime: dt.timedelta=dt.timedelta(hours=1),
-):
+) -> Tuple[dt.datetime, dt.datetime]:
     """
     convert a string description of a daterange into start and end datetime
 
@@ -158,7 +158,8 @@ def start_end_from_daterange(
     :param locale: locale settings
     """
     if not daterange:
-        start = dt.datetime(*dt.date.today().timetuple()[:3])
+        today = dt.datetime.now(locale['local_timezone']).date()
+        start = dt.datetime.combine(today, dt.time.min)
         end = start + default_timedelta_date
     else:
         start, end, allday = parse_datetime.guessrangefstr(
@@ -203,8 +204,11 @@ def get_events_between(
         env = {}
     assert start
     assert end
-    start_local = locale['local_timezone'].localize(start)
-    end_local = locale['local_timezone'].localize(end)
+    assert start.tzinfo is not None
+    assert end.tzinfo is not None
+
+    start_local = start
+    end_local = end
 
     start = start_local.replace(tzinfo=None)
     end = end_local.replace(tzinfo=None)
@@ -272,6 +276,8 @@ def khal_list(
             default_timedelta_datetime=conf['default']['timedelta'],
         )
         logger.debug(f'Getting all events between {start} and {end}')
+        assert start.tzinfo is not None
+        assert end.tzinfo is not None
 
     elif datepoint is not None:
         if not datepoint:
@@ -294,18 +300,23 @@ def khal_list(
                 bold=True,
             )
         logger.debug(f'Getting all events between {start} and {end}')
+        assert start.tzinfo is not None
+        assert end.tzinfo is not None
+    else:
+        raise ValueError('Something has gone wrong')
 
     event_column: List[str] = []
     once = set() if once else None
     if env is None:
         env = {}
 
-    original_start = conf['locale']['local_timezone'].localize(start)
+    original_start = start
     while start < end:
         if start.date() == end.date():
             day_end = end
         else:
             day_end = dt.datetime.combine(start.date(), dt.time.max)
+        day_end = day_end.replace(tzinfo=start.tzinfo)
         current_events = get_events_between(
             collection, locale=conf['locale'], formatter=formatter, start=start,
             end=day_end, notstarted=notstarted, original_start=original_start,
@@ -319,6 +330,7 @@ def khal_list(
             event_column.append(format_day(start.date(), day_format, conf['locale']))
         event_column.extend(current_events)
         start = dt.datetime(*start.date().timetuple()[:3]) + dt.timedelta(days=1)
+        start = start.replace(tzinfo=original_start.tzinfo)
 
     return event_column
 
@@ -555,7 +567,7 @@ def edit_event(event, collection, locale, allow_quit=False, width=80):
                 until = prompt('until (or "None")', until)
                 if until == 'None':
                     until = None
-                rrule = parse_datetime.rrulefstr(freq, until, locale, event.start.tzinfo)
+                rrule = parse_datetime.rrulefstr(freq, until, locale)
                 event.update_rrule(rrule)
             edited = True
         elif choice == "alarm":

khal/icalendar.py

@@ -116,8 +116,8 @@ def new_vevent(locale,
     if not allday and timezone is not None:
         assert isinstance(dtstart, dt.datetime)
         assert isinstance(dtend, dt.datetime)
-        dtstart = timezone.localize(dtstart)
-        dtend = timezone.localize(dtend)
+        assert dtstart.tzinfo is not None
+        assert dtend.tzinfo is not None
 
     event = icalendar.Event()
     event.add('dtstart', dtstart)
@@ -136,7 +136,7 @@ def new_vevent(locale,
     if url:
         event.add('url', icalendar.vUri(url))
     if repeat and repeat != "none":
-        rrule = rrulefstr(repeat, until, locale, getattr(dtstart, 'tzinfo', None))
+        rrule = rrulefstr(repeat, until, locale)
         event.add('rrule', rrule)
     if alarms:
         for alarm in str2alarm(alarms, description or ''):