From 2ed2031524cd760cea765e08045ad04aa2bea199 Mon Sep 17 00:00:00 2001 From: Filip Pytloun Date: Mon, 11 Dec 2017 17:33:41 +0100 Subject: [PATCH 1/2] Import python-click-threading_0.4.4.orig.tar.gz --- click_threading/__init__.py | 2 +- click_threading/_compat.py | 3 +++ click_threading/monkey.py | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/click_threading/__init__.py b/click_threading/__init__.py index 3d022d0..8a2bdfd 100644 --- a/click_threading/__init__.py +++ b/click_threading/__init__.py @@ -21,7 +21,7 @@ try: except ImportError: from futures import Future as _Future -__version__ = '0.4.3' +__version__ = '0.4.4' _CTX_WORKER_KEY = __name__ + '.uiworker' diff --git a/click_threading/_compat.py b/click_threading/_compat.py index 9f1e82d..466ee8a 100644 --- a/click_threading/_compat.py +++ b/click_threading/_compat.py @@ -1,12 +1,15 @@ # -*- coding: utf-8 -*- +import inspect import sys PY2 = sys.version_info[0] == 2 if PY2: + getargspec = inspect.getargspec exec('def reraise(tp, value, tb=None):\n raise tp, value, tb') else: + getargspec = inspect.getfullargspec def reraise(tp, value, tb=None): if value.__traceback__ is not tb: raise value.with_traceback(tb) diff --git a/click_threading/monkey.py b/click_threading/monkey.py index 4eb2662..1c16cd6 100644 --- a/click_threading/monkey.py +++ b/click_threading/monkey.py @@ -4,7 +4,7 @@ import types import contextlib import inspect -from ._compat import PY2 +from ._compat import PY2, getargspec class FunctionInfo(object): @@ -40,7 +40,7 @@ def patch_ui_functions(wrapper): new_f = wrapper(_copy_fn(f), info) - argspec = inspect.getargspec(f) + argspec = getargspec(f) signature = inspect.formatargspec(*argspec) \ .lstrip('(') \ .rstrip(')') From 97c8c550c212e571b1c1ec8a2feffc620d80aaa6 Mon Sep 17 00:00:00 2001 From: Filip Pytloun Date: Fri, 12 Aug 2016 11:23:17 +0200 Subject: [PATCH 2/2] Fix conditional dependency on futures --- setup.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 1b3d84f..0f7cd9c 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,6 @@ #!/usr/bin/env python +import sys import ast import re @@ -11,6 +12,13 @@ with open('click_threading/__init__.py', 'rb') as f: version = str(ast.literal_eval(_version_re.search( f.read().decode('utf-8')).group(1))) +INSTALL_REQUIRES = [ + 'click>=5.0', +] + +if sys.version_info[0] == 2: + INSTALL_REQUIRES.append('futures') + setup( name='click-threading', version=version, @@ -20,10 +28,5 @@ setup( url='https://github.com/click-contrib/click-threading', license='MIT', packages=['click_threading'], - install_requires=[ - 'click>=5.0', - ], - extras_require={ - ':python_version < "3.2"': 'futures' - } + install_requires=INSTALL_REQUIRES )