From c2e26d4ef17508b9270f4e0e49242fd3b0423913 Mon Sep 17 00:00:00 2001 From: Jordan Adler Date: Wed, 9 Oct 2019 17:10:28 -0700 Subject: [PATCH 1/4] Update dates --- LICENSE.txt | 2 +- README.rst | 2 +- futurize.py | 2 +- pasteurize.py | 2 +- src/future/__init__.py | 4 ++-- src/past/__init__.py | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index d41c85d1..4c904dba 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2013-2018 Python Charmers Pty Ltd, Australia +Copyright (c) 2013-2019 Python Charmers Pty Ltd, Australia Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.rst b/README.rst index 6266618c..ea806538 100644 --- a/README.rst +++ b/README.rst @@ -266,7 +266,7 @@ Licensing :Author: Ed Schofield, Jordan M. Adler, et al -:Copyright: 2013-2018 Python Charmers Pty Ltd, Australia. +:Copyright: 2013-2019 Python Charmers Pty Ltd, Australia. :Sponsors: Python Charmers Pty Ltd, Australia, and Python Charmers Pte Ltd, Singapore. http://pythoncharmers.com diff --git a/futurize.py b/futurize.py index 41080cf0..cb446ab2 100755 --- a/futurize.py +++ b/futurize.py @@ -13,7 +13,7 @@ Licensing --------- -Copyright 2013-2018 Python Charmers Pty Ltd, Australia. +Copyright 2013-2019 Python Charmers Pty Ltd, Australia. The software is distributed under an MIT licence. See LICENSE.txt. """ diff --git a/pasteurize.py b/pasteurize.py index c0bd7e09..2b98327c 100755 --- a/pasteurize.py +++ b/pasteurize.py @@ -12,7 +12,7 @@ Licensing --------- -Copyright 2013-2018 Python Charmers Pty Ltd, Australia. +Copyright 2013-2019 Python Charmers Pty Ltd, Australia. The software is distributed under an MIT licence. See LICENSE.txt. """ diff --git a/src/future/__init__.py b/src/future/__init__.py index bbb77594..d44e16c8 100644 --- a/src/future/__init__.py +++ b/src/future/__init__.py @@ -76,7 +76,7 @@ Licensing --------- -Copyright 2013-2018 Python Charmers Pty Ltd, Australia. +Copyright 2013-2019 Python Charmers Pty Ltd, Australia. The software is distributed under an MIT licence. See LICENSE.txt. """ @@ -84,7 +84,7 @@ __title__ = 'future' __author__ = 'Ed Schofield' __license__ = 'MIT' -__copyright__ = 'Copyright 2013-2018 Python Charmers Pty Ltd' +__copyright__ = 'Copyright 2013-2019 Python Charmers Pty Ltd' __ver_major__ = 0 __ver_minor__ = 18 __ver_patch__ = 0 diff --git a/src/past/__init__.py b/src/past/__init__.py index 07422a03..14713039 100644 --- a/src/past/__init__.py +++ b/src/past/__init__.py @@ -74,13 +74,13 @@ Credits ------- -:Author: Ed Schofield +:Author: Ed Schofield, Jordan M. Adler, et al :Sponsor: Python Charmers Pty Ltd, Australia: http://pythoncharmers.com Licensing --------- -Copyright 2013-2018 Python Charmers Pty Ltd, Australia. +Copyright 2013-2019 Python Charmers Pty Ltd, Australia. The software is distributed under an MIT licence. See LICENSE.txt. """ From c24dfc48ea045f40c348e444bc2add983dd149e3 Mon Sep 17 00:00:00 2001 From: Jordan Adler Date: Thu, 10 Oct 2019 15:07:22 -0700 Subject: [PATCH 2/4] bugfix for issubclass check --- src/future/utils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/future/utils/__init__.py b/src/future/utils/__init__.py index a6b10210..443dae65 100644 --- a/src/future/utils/__init__.py +++ b/src/future/utils/__init__.py @@ -415,7 +415,7 @@ def raise_(tp, value=None, tb=None): if value is not None: raise TypeError("instance exception may not have a separate value") exc = tp - elif not issubclass(tp, Exception): + elif isinstance(tp, type) and not issubclass(tp, Exception): # If the first object is a class, it becomes the type of the # exception. raise TypeError("class must derive from Exception") From a4f0145b105a6bb1d8d669991ed71d55eecd3187 Mon Sep 17 00:00:00 2001 From: Jordan Adler Date: Thu, 10 Oct 2019 15:07:22 -0700 Subject: [PATCH 3/4] bugfix for issubclass check --- src/future/utils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/future/utils/__init__.py b/src/future/utils/__init__.py index a6b10210..443dae65 100644 --- a/src/future/utils/__init__.py +++ b/src/future/utils/__init__.py @@ -415,7 +415,7 @@ def raise_(tp, value=None, tb=None): if value is not None: raise TypeError("instance exception may not have a separate value") exc = tp - elif not issubclass(tp, Exception): + elif isinstance(tp, type) and not issubclass(tp, Exception): # If the first object is a class, it becomes the type of the # exception. raise TypeError("class must derive from Exception") From c9e4e962478f16932d592584a0351d727ee71b6d Mon Sep 17 00:00:00 2001 From: Jordan Adler Date: Thu, 17 Oct 2019 18:07:07 +0000 Subject: [PATCH 4/4] Prepare for 0.18.1 release --- docs/whatsnew.rst | 6 ++++++ src/future/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/whatsnew.rst b/docs/whatsnew.rst index 50b2a99c..7d6a1071 100644 --- a/docs/whatsnew.rst +++ b/docs/whatsnew.rst @@ -3,6 +3,12 @@ What's New ********** +What's new in version 0.18.1 (2019-10-09) +========================================= +This is a minor bug-fix release containing a fix for raise_() +when passed an exception that's not an Exception (e.g. BaseException +subclasses) + What's new in version 0.18.0 (2019-10-09) ========================================= This is a major bug-fix and feature release, including: diff --git a/src/future/__init__.py b/src/future/__init__.py index d44e16c8..24f10fa1 100644 --- a/src/future/__init__.py +++ b/src/future/__init__.py @@ -87,7 +87,7 @@ __copyright__ = 'Copyright 2013-2019 Python Charmers Pty Ltd' __ver_major__ = 0 __ver_minor__ = 18 -__ver_patch__ = 0 +__ver_patch__ = 1 __ver_sub__ = '' __version__ = "%d.%d.%d%s" % (__ver_major__, __ver_minor__, __ver_patch__, __ver_sub__)