Merge branch 'master' into feat-ext-lib-reduction

4 files changed, 28 insertions, 6 deletions

diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
index 34dec96..3147664 100644
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -1,8 +1,8 @@
 Changelog
 ==============
 
-1.0.9 (unreleased)
-------------------
+1.0.10 (unreleased)
+-------------------
 
 - Remove external library ``natsort``.
   Sorting of cron expression components now handled with ``sorted()`` with a custom ``key`` function.
@@ -10,6 +10,13 @@ Changelog
 
 
 
+1.0.9 (2021-03-23)
+------------------
+
+- Remove futures dependency
+  [kiorky]
+
+
 1.0.8 (2021-03-06)
 ------------------
 
diff --git a/requirements/base.txt b/requirements/base.txt
index 7ff05fa..14d6dd6 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,3 +1,2 @@
 python_dateutil
-future
 -e .
diff --git a/setup.py b/setup.py
index 15000d4..3e692c6 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ long_description = "\n\n".join(
 
 setup(
     name='croniter',
-    version='1.0.9.dev0',
+    version='1.0.10.dev0',
     py_modules=['croniter', ],
     description=(
         'croniter provides iteration for datetime '
diff --git a/src/croniter/croniter.py b/src/croniter/croniter.py
index 3d1001b..8295858 100644
--- a/src/croniter/croniter.py
+++ b/src/croniter/croniter.py
@@ -6,12 +6,12 @@ from __future__ import absolute_import, print_function, division
 import math
 import re
 import sys
+import inspect
 from time import time
 import datetime
 from dateutil.relativedelta import relativedelta
 from dateutil.tz import tzutc
 import calendar
-from future.utils import raise_from
 
 
 step_search_re = re.compile(r'^([^-]+)-([^-/]+)(/(\d+))?$')
@@ -20,6 +20,18 @@ star_or_int_re = re.compile(r'^(\d+|\*)$')
 VALID_LEN_EXPRESSION = [5, 6]
 
 
+def _get_caller_globals_and_locals():
+    """
+    Returns the globals and locals of the calling frame.
+
+    Is there an alternative to frame hacking here?
+    """
+    caller_frame = inspect.stack()[2]
+    myglobals = caller_frame[0].f_globals
+    mylocals = caller_frame[0].f_locals
+    return myglobals, mylocals
+
+
 class CroniterError(ValueError):
     """ General top-level Croniter base exception """
     pass
@@ -661,7 +673,11 @@ class croniter(object):
             error_type, error_instance, traceback = sys.exc_info()
             if isinstance(exc, CroniterError):
                 raise
-            raise_from(CroniterBadCronError, exc)
+            if int(sys.version[0]) >= 3:
+                globs, locs = _get_caller_globals_and_locals()
+                exec("raise CroniterBadCronError from  exc", globs, locs)
+            else:
+                raise CroniterBadCronError("{0}".format(exc))
 
     @classmethod
     def is_valid(cls, expression):