merge patched into master

This commit is contained in:
Filip Pytloun 2017-12-11 17:33:49 +01:00
commit d0cd7edd3b
5 changed files with 10 additions and 7 deletions

View file

@ -21,7 +21,7 @@ try:
except ImportError: except ImportError:
from futures import Future as _Future from futures import Future as _Future
__version__ = '0.4.3' __version__ = '0.4.4'
_CTX_WORKER_KEY = __name__ + '.uiworker' _CTX_WORKER_KEY = __name__ + '.uiworker'

View file

@ -1,12 +1,15 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import inspect
import sys import sys
PY2 = sys.version_info[0] == 2 PY2 = sys.version_info[0] == 2
if PY2: if PY2:
getargspec = inspect.getargspec
exec('def reraise(tp, value, tb=None):\n raise tp, value, tb') exec('def reraise(tp, value, tb=None):\n raise tp, value, tb')
else: else:
getargspec = inspect.getfullargspec
def reraise(tp, value, tb=None): def reraise(tp, value, tb=None):
if value.__traceback__ is not tb: if value.__traceback__ is not tb:
raise value.with_traceback(tb) raise value.with_traceback(tb)

View file

@ -4,7 +4,7 @@ import types
import contextlib import contextlib
import inspect import inspect
from ._compat import PY2 from ._compat import PY2, getargspec
class FunctionInfo(object): class FunctionInfo(object):
@ -40,7 +40,7 @@ def patch_ui_functions(wrapper):
new_f = wrapper(_copy_fn(f), info) new_f = wrapper(_copy_fn(f), info)
argspec = inspect.getargspec(f) argspec = getargspec(f)
signature = inspect.formatargspec(*argspec) \ signature = inspect.formatargspec(*argspec) \
.lstrip('(') \ .lstrip('(') \
.rstrip(')') .rstrip(')')

6
debian/.git-dpm vendored
View file

@ -1,7 +1,7 @@
# see git-dpm(1) from git-dpm package # see git-dpm(1) from git-dpm package
a6ab771391afe1f9c23349feac29d0682524782d 97c8c550c212e571b1c1ec8a2feffc620d80aaa6
a6ab771391afe1f9c23349feac29d0682524782d 97c8c550c212e571b1c1ec8a2feffc620d80aaa6
09288b0632585c754fe840aa3b1211dbbfad5118 2ed2031524cd760cea765e08045ad04aa2bea199
2ed2031524cd760cea765e08045ad04aa2bea199 2ed2031524cd760cea765e08045ad04aa2bea199
python-click-threading_0.4.4.orig.tar.gz python-click-threading_0.4.4.orig.tar.gz
5aedcc7165db1a92a8c6b82cca0b5c1a3084b194 5aedcc7165db1a92a8c6b82cca0b5c1a3084b194

View file

@ -1,4 +1,4 @@
From a6ab771391afe1f9c23349feac29d0682524782d Mon Sep 17 00:00:00 2001 From 97c8c550c212e571b1c1ec8a2feffc620d80aaa6 Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip@pytloun.cz> From: Filip Pytloun <filip@pytloun.cz>
Date: Fri, 12 Aug 2016 11:23:17 +0200 Date: Fri, 12 Aug 2016 11:23:17 +0200
Subject: Fix conditional dependency on futures Subject: Fix conditional dependency on futures