Merge pull request #6 from dapper91/dev

Dev

Author: dapper91

CHANGELOG.rst

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.1.4 (2021-03-19)
+------------------
+
+- timezone bug fixed
+
+
 0.1.3 (2021-03-18)
 ------------------
 

README.rst

@@ -41,7 +41,7 @@ Quickstart
 
 
 Get next cron fire time:
-________________________
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. code-block:: python
 
@@ -62,7 +62,7 @@ ________________________
 
 
 Iteration over cron fire times starting from now:
-_________________________________________________
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. code-block:: python
 

crontools/__about__.py

@@ -2,7 +2,7 @@
 __description__ = 'Python cron tools'
 __url__ = 'https://github.com/dapper91/crontools'
 
-__version__ = '0.1.3'
+__version__ = '0.1.4'
 
 __author__ = 'Dmitry Pershin'
 __email__ = '[email protected]'

crontools/crontab.py

@@ -289,7 +289,7 @@ class DayField:
     crontab week days and month days of the current month sequentially.
     """
 
-    def __init__(self, monthday_field: Field[MonthdayRange], weekday_field:  Field[WeekdayRange], tz: dt.timezone):
+    def __init__(self, monthday_field: Field[MonthdayRange], weekday_field:  Field[WeekdayRange], tz: dt.tzinfo):
         self._monthday_field = monthday_field
         self._weekday_field = weekday_field
         self._tz = tz
@@ -378,7 +378,7 @@ class Crontab:
 
     seconds_ext: bool = False
     years_ext: bool = False
-    tz: dt.timezone = dt.timezone.utc
+    tz: dt.tzinfo = dt.timezone.utc
 
     @property
     def day_field(self) -> DayField:
@@ -407,7 +407,7 @@ def parse(
             expr: str,
             seconds_ext: bool = False,
             years_ext: bool = False,
-            tz: dt.timezone = tzlocal.get_localzone(),
+            tz: dt.tzinfo = tzlocal.get_localzone(),
             now: Optional[dt.datetime] = None,
     ) -> 'Crontab':
         """
@@ -427,7 +427,7 @@ def parse(
             raise ValueError(f"crontab expression must be of {fields_number} fields")
 
         fields_iter = iter(fields)
-        now = now or dt.datetime.now(tz=tz)
+        now = (now or dt.datetime.now(tz=tz)).astimezone(tz)
 
         return cls(
             second_field=SecondsField.fromstr(next(fields_iter)) if seconds_ext else SecondsField.fromstr('0'),
@@ -439,7 +439,7 @@ def parse(
             year_field=YearField.fromstr(next(fields_iter)) if years_ext else YearField.fromstr(f'{now.year}-2099'),
             seconds_ext=seconds_ext,
             years_ext=years_ext,
-            tz=tz,
+            tz=now.tzinfo,
         )
 
     def __iter__(self) -> Iterator[dt.datetime]:
@@ -461,6 +461,7 @@ def iter(self, start_from: dt.datetime) -> Iterator[dt.datetime]:
         :return: datetime iterator
         """
 
+        start_from = start_from.astimezone(self.tz)
         first_run = True
         year_iter = self.year_field.iter(start_from=start_from.year)