From faea61a76eb04910ca2ce9765361db22ca075248 Mon Sep 17 00:00:00 2001 From: Johnny Robeson Date: Mon, 20 Jun 2016 05:53:24 -0400 Subject: [PATCH] use the real six.reraise in bluelet --- beets/util/bluelet.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/beets/util/bluelet.py b/beets/util/bluelet.py index d81c2919a..48dd7bd94 100644 --- a/beets/util/bluelet.py +++ b/beets/util/bluelet.py @@ -9,6 +9,7 @@ Bluelet: easy concurrency without all the messy parallelism. """ from __future__ import division, absolute_import, print_function +import six import socket import select import sys @@ -19,20 +20,6 @@ import time import collections -# A little bit of "six" (Python 2/3 compatibility): cope with PEP 3109 syntax -# changes. - -PY3 = sys.version_info[0] == 3 -if PY3: - def _reraise(typ, exc, tb): - raise exc.with_traceback(tb) -else: - exec(""" -def _reraise(typ, exc, tb): - raise typ, exc, tb -""") - - # Basic events used for thread scheduling. class Event(object): @@ -214,7 +201,7 @@ class ThreadException(Exception): self.exc_info = exc_info def reraise(self): - _reraise(self.exc_info[0], self.exc_info[1], self.exc_info[2]) + six.reraise(self.exc_info[0], self.exc_info[1], self.exc_info[2]) SUSPENDED = Event() # Special sentinel placeholder for suspended threads.