Merge branch '1.0-maintenance'

This commit is contained in:
David Lord 2019-01-06 10:36:54 -08:00
commit 3b45b82ec2
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
13 changed files with 68 additions and 57 deletions

View file

@ -28,6 +28,7 @@ if not PY2:
from inspect import getfullargspec as getargspec
from io import StringIO
import collections.abc as collections_abc
def reraise(tp, value, tb=None):
if value.__traceback__ is not tb:
@ -47,6 +48,7 @@ else:
from inspect import getargspec
from cStringIO import StringIO
import collections as collections_abc
exec('def reraise(tp, value, tb=None):\n raise tp, value, tb')