diff options
| author | Alex Grönholm <alex.gronholm@nextday.fi> | 2019-11-05 09:23:11 +0200 |
|---|---|---|
| committer | Alex Grönholm <alex.gronholm@nextday.fi> | 2019-11-05 09:23:11 +0200 |
| commit | 028506a816c74ee05951717c0e45d2e6ad32773e (patch) | |
| tree | 6a374c1b8709af23f7deef42f2dc9b806f41ac74 | |
| parent | 9f123913c89d3cec143dd3da985854a2835eda22 (diff) | |
| download | apscheduler-028506a816c74ee05951717c0e45d2e6ad32773e.tar.gz | |
Fixed ImportError on py2.7 if trollius not installedv3.6.3
Fixes #403.
| -rw-r--r-- | apscheduler/util.py | 6 | ||||
| -rw-r--r-- | docs/versionhistory.rst | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/apscheduler/util.py b/apscheduler/util.py index a596ddf..8b7b3f5 100644 --- a/apscheduler/util.py +++ b/apscheduler/util.py @@ -24,7 +24,11 @@ except ImportError: try: from asyncio import iscoroutinefunction except ImportError: - from trollius import iscoroutinefunction + try: + from trollius import iscoroutinefunction + except ImportError: + def iscoroutinefunction(func): + return False __all__ = ('asint', 'asbool', 'astimezone', 'convert_to_datetime', 'datetime_to_utc_timestamp', 'utc_timestamp_to_datetime', 'timedelta_seconds', 'datetime_ceil', 'get_callable_name', diff --git a/docs/versionhistory.rst b/docs/versionhistory.rst index 47b0ed2..79a40f7 100644 --- a/docs/versionhistory.rst +++ b/docs/versionhistory.rst @@ -4,6 +4,12 @@ Version history To find out how to migrate your application from a previous version of APScheduler, see the :doc:`migration section <migration>`. +3.6.3 +----- + +* Fixed Python 2.7 accidentally depending on the ``trollius`` package (regression from v3.6.2) + + 3.6.2 ----- |