Parcourir la source

Use vine.utils.wraps to ensure __wrapped__ is set

Ask Solem il y a 9 ans
Parent
commit
fdf1a0f6a3

+ 1 - 1
celery/app/base.py

@@ -14,13 +14,13 @@ import warnings
 
 from collections import defaultdict, deque
 from operator import attrgetter
-from functools import wraps
 
 from kombu import pools
 from kombu.clocks import LamportClock
 from kombu.common import oid_from
 from kombu.utils import cached_property, register_after_fork, uuid
 from vine import starpromise
+from vine.utils import wraps
 
 from celery import platforms
 from celery import signals

+ 2 - 1
celery/backends/database/__init__.py

@@ -11,7 +11,8 @@ from __future__ import absolute_import, unicode_literals
 import logging
 
 from contextlib import contextmanager
-from functools import wraps
+
+from vine.utils import wraps
 
 from celery import states
 from celery.backends.base import BaseBackend

+ 1 - 2
celery/tests/app/test_control.py

@@ -1,8 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
-from functools import wraps
-
 from kombu.pidbox import Mailbox
+from vine.utils import wraps
 
 from celery.app import control
 from celery.exceptions import DuplicateNodenameWarning

+ 2 - 1
celery/tests/case.py

@@ -10,10 +10,11 @@ import threading
 
 from copy import deepcopy
 from datetime import datetime, timedelta
-from functools import partial, wraps
+from functools import partial
 
 from kombu import Queue
 from kombu.utils import symbol_by_name
+from vine.utils import wraps
 
 from celery import Celery
 from celery.app import current_app

+ 1 - 1
celery/tests/compat_modules/test_http.py

@@ -2,7 +2,6 @@
 from __future__ import absolute_import, unicode_literals
 
 from contextlib import contextmanager
-from functools import wraps
 try:
     from urllib import addinfourl
 except ImportError:  # py3k
@@ -10,6 +9,7 @@ except ImportError:  # py3k
 
 from kombu.utils.encoding import from_utf8
 from kombu.utils.json import dumps
+from vine.utils import wraps
 
 from celery.five import WhateverIO, items
 from celery.task import http

+ 2 - 1
celery/utils/__init__.py

@@ -18,10 +18,11 @@ import warnings
 import datetime
 
 from collections import Callable
-from functools import partial, wraps
+from functools import partial
 from pprint import pprint
 
 from kombu.entity import Exchange, Queue
+from vine.utils import wraps
 
 from celery.exceptions import CPendingDeprecationWarning, CDeprecationWarning
 from celery.five import WhateverIO, items, reraise, string_t