…mpat issues (#4679)

* imported from renamed asynchronous module of kombu

* imported from renamed asynchronous module of kombu

* imported from renamed asynchronous module of kombu in utils timer2

* update minimum kombu version

.bumpversion.cfg

@@ -1,5 +1,5 @@
[bumpversion]
current_version = 4.1.0
current_version = 4.1.1
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<releaselevel>[a-z]+)?

README.rst

@@ -2,7 +2,7 @@

|build-status| |license| |wheel| |pyversion| |pyimp|

:Version: 4.1.0 (latentcall)
:Version: 4.1.1 (latentcall)
:Web: http://celeryproject.org/
:Download: https://pypi.python.org/pypi/celery/
:Source: https://github.com/celery/celery/

celery/__init__.py

@@ -14,7 +14,7 @@

SERIES = 'latentcall'

__version__ = '4.1.0'
__version__ = '4.1.1'
__author__ = 'Ask Solem'
__contact__ = 'ask@celeryproject.org'
__homepage__ = 'http://celeryproject.org'
@@ -145,6 +145,7 @@ def maybe_patch_concurrency(argv=sys.argv,
        from celery import concurrency
        concurrency.get_implementation(pool)


# Lazy loading
from . import local  # noqa

celery/__main__.py

@@ -1,6 +1,8 @@
"""Entry-point for the :program:`celery` umbrella command."""
from __future__ import absolute_import, print_function, unicode_literals

import sys

from . import maybe_patch_concurrency

__all__ = ['main']

celery/_state.py

@@ -7,10 +7,12 @@
This module shouldn't be used directly.
"""
from __future__ import absolute_import, print_function, unicode_literals

import os
import sys
import threading
import weakref

from celery.local import Proxy
from celery.utils.threads import LocalStack

celery/app/amqp.py

@@ -4,13 +4,11 @@

import numbers
import sys

from collections import Mapping, namedtuple
from datetime import timedelta
from weakref import WeakValueDictionary

from kombu import pools
from kombu import Connection, Consumer, Exchange, Producer, Queue
from kombu import Connection, Consumer, Exchange, Producer, Queue, pools
from kombu.common import Broadcast
from kombu.utils.functional import maybe_list
from kombu.utils.objects import cached_property
@@ -522,7 +520,7 @@ def send_task_message(producer, name, message,

            # convert to anon-exchange, when exchange not set and direct ex.
            if (not exchange or not routing_key) and exchange_type == 'direct':
                    exchange, routing_key = '', qname
                exchange, routing_key = '', qname
            elif exchange is None:
                # not topic exchange, and exchange not undefined
                exchange = queue.exchange.name or default_exchange

celery/app/annotations.py

@@ -8,6 +8,7 @@
:setting:`task_annotations` setting.
"""
from __future__ import absolute_import, unicode_literals

from celery.five import string_t
from celery.utils.functional import firstmethod, mlazy
from celery.utils.imports import instantiate

celery/app/backends.py

@@ -1,10 +1,12 @@
# -*- coding: utf-8 -*-
"""Backend selection."""
from __future__ import absolute_import, unicode_literals

import sys
import types
from celery.exceptions import ImproperlyConfigured

from celery._state import current_app
from celery.exceptions import ImproperlyConfigured
from celery.five import reraise
from celery.utils.imports import load_extension_class_names, symbol_by_name

celery/app/base.py

@@ -5,7 +5,6 @@
import os
import threading
import warnings

from collections import defaultdict, deque
from operator import attrgetter

@@ -18,42 +17,34 @@
from vine import starpromise
from vine.utils import wraps

from celery import platforms
from celery import signals
from celery._state import (
    _task_stack, get_current_app, _set_current_app, set_default_app,
    _register_app, _deregister_app,
    get_current_worker_task, connect_on_app_finalize,
    _announce_app_finalized,
)
from celery import platforms, signals
from celery._state import (_announce_app_finalized, _deregister_app,
                           _register_app, _set_current_app, _task_stack,
                           connect_on_app_finalize, get_current_app,
                           get_current_worker_task, set_default_app)
from celery.exceptions import AlwaysEagerIgnored, ImproperlyConfigured
from celery.five import (
    UserDict, bytes_if_py2, python_2_unicode_compatible, values,
)
from celery.five import (UserDict, bytes_if_py2, python_2_unicode_compatible,
                         values)
from celery.loaders import get_loader_cls
from celery.local import PromiseProxy, maybe_evaluate
from celery.utils import abstract
from celery.utils.collections import AttributeDictMixin
from celery.utils.dispatch import Signal
from celery.utils.functional import first, maybe_list, head_from_fun
from celery.utils.time import timezone
from celery.utils.functional import first, head_from_fun, maybe_list
from celery.utils.imports import gen_task_name, instantiate, symbol_by_name
from celery.utils.log import get_logger
from celery.utils.objects import FallbackContext, mro_lookup
from celery.utils.time import timezone

from .annotations import prepare as prepare_annotations
# Load all builtin tasks
from . import builtins  # noqa
from . import backends
from .annotations import prepare as prepare_annotations
from .defaults import find_deprecated_settings
from .registry import TaskRegistry
from .utils import (
    AppPickler, Settings,
    bugreport, _unpickle_app, _unpickle_app_v2,
    _old_key_to_new, _new_key_to_old,
    appstr, detect_settings,
)

# Load all builtin tasks
from . import builtins  # noqa
from .utils import (AppPickler, Settings, _new_key_to_old, _old_key_to_new,
                    _unpickle_app, _unpickle_app_v2, appstr, bugreport,
                    detect_settings)

__all__ = ['Celery']

@@ -1252,4 +1243,6 @@ def timezone(self):
                if not conf.timezone:
                    return timezone.local
        return timezone.get_timezone(tz)


App = Celery  # noqa: E305 XXX compat

celery/app/builtins.py

@@ -4,6 +4,7 @@
The built-in tasks are always available in all app instances.
"""
from __future__ import absolute_import, unicode_literals

from celery._state import connect_on_app_finalize
from celery.utils.log import get_logger

celery/app/control.py

@@ -5,11 +5,14 @@
Server implementation is in :mod:`celery.worker.control`.
"""
from __future__ import absolute_import, unicode_literals

import warnings

from billiard.common import TERM_SIGNAME
from kombu.pidbox import Mailbox
from kombu.utils.functional import lazy
from kombu.utils.objects import cached_property

from celery.exceptions import DuplicateNodenameWarning
from celery.utils.text import pluralize

celery/app/defaults.py

@@ -1,9 +1,11 @@
# -*- coding: utf-8 -*-
"""Configuration introspection and defaults."""
from __future__ import absolute_import, unicode_literals

import sys
from collections import deque, namedtuple
from datetime import timedelta

from celery.five import items, keys, python_2_unicode_compatible
from celery.utils.functional import memoize
from celery.utils.serialization import strtobool

celery/app/events.py

@@ -1,6 +1,8 @@
"""Implementation for the app.events shortcuts."""
from __future__ import absolute_import, unicode_literals

from contextlib import contextmanager

from kombu.utils.objects import cached_property

celery/app/log.py

@@ -12,7 +12,6 @@
import logging
import os
import sys

from logging.handlers import WatchedFileHandler

from kombu.utils.encoding import set_default_encoding_file
@@ -22,11 +21,9 @@
from celery.five import string_t
from celery.local import class_property
from celery.platforms import isatty
from celery.utils.log import (
    get_logger, mlevel,
    ColorFormatter, LoggingProxy, get_multiprocessing_logger,
    reset_multiprocessing_logger,
)
from celery.utils.log import (ColorFormatter, LoggingProxy, get_logger,
                              get_multiprocessing_logger, mlevel,
                              reset_multiprocessing_logger)
from celery.utils.nodenames import node_format
from celery.utils.term import colored

celery/app/registry.py

@@ -1,10 +1,12 @@
# -*- coding: utf-8 -*-
"""Registry of available tasks."""
from __future__ import absolute_import, unicode_literals

import inspect
from importlib import import_module

from celery._state import get_current_app
from celery.exceptions import NotRegistered, InvalidTaskError
from celery.exceptions import InvalidTaskError, NotRegistered
from celery.five import items

__all__ = ['TaskRegistry']

celery/app/routes.py

@@ -4,10 +4,13 @@
Contains utilities for working with task routers, (:setting:`task_routes`).
"""
from __future__ import absolute_import, unicode_literals

import re
import string
from collections import Mapping, OrderedDict

from kombu import Queue

from celery.exceptions import QueueNotFound
from celery.five import items, string_t
from celery.utils.collections import lpmerge

celery/app/task.py

@@ -8,8 +8,7 @@
from kombu.exceptions import OperationalError
from kombu.utils.uuid import uuid

from celery import current_app, group
from celery import states
from celery import current_app, group, states
from celery._state import _task_stack
from celery.canvas import signature
from celery.exceptions import Ignore, MaxRetriesExceededError, Reject, Retry
@@ -1006,4 +1005,6 @@ def backend(self, value):  # noqa
    @property
    def __name__(self):
        return self.__class__.__name__


BaseTask = Task  # noqa: E305 XXX compat alias

celery/app/trace.py

@@ -6,42 +6,43 @@
"""
from __future__ import absolute_import, unicode_literals

# ## ---
# This is the heart of the worker, the inner loop so to speak.
# It used to be split up into nice little classes and methods,
# but in the end it only resulted in bad performance and horrible tracebacks,
# so instead we now use one closure per task class.

# pylint: disable=redefined-outer-name
# We cache globals and attribute lookups, so disable this warning.
# pylint: disable=broad-except
# We know what we're doing...

import logging
import os
import sys

from collections import namedtuple
from warnings import warn

from billiard.einfo import ExceptionInfo
from kombu.exceptions import EncodeError
from kombu.serialization import loads as loads_message, prepare_accept_content
from kombu.serialization import loads as loads_message
from kombu.serialization import prepare_accept_content
from kombu.utils.encoding import safe_repr, safe_str

from celery import current_app, group
from celery import states, signals
from celery import current_app, group, signals, states
from celery._state import _task_stack
from celery.app.task import Task as BaseTask, Context
from celery.exceptions import Ignore, Reject, Retry, InvalidTaskError
from celery.app.task import Context
from celery.app.task import Task as BaseTask
from celery.exceptions import Ignore, InvalidTaskError, Reject, Retry
from celery.five import monotonic, text_t
from celery.utils.log import get_logger
from celery.utils.nodenames import gethostname
from celery.utils.objects import mro_lookup
from celery.utils.saferepr import saferepr
from celery.utils.serialization import (
    get_pickleable_exception, get_pickled_exception, get_pickleable_etype,
)
from celery.utils.serialization import (get_pickleable_etype,
                                        get_pickleable_exception,
                                        get_pickled_exception)

# ## ---
# This is the heart of the worker, the inner loop so to speak.
# It used to be split up into nice little classes and methods,
# but in the end it only resulted in bad performance and horrible tracebacks,
# so instead we now use one closure per task class.

# pylint: disable=redefined-outer-name
# We cache globals and attribute lookups, so disable this warning.
# pylint: disable=broad-except
# We know what we're doing...


__all__ = [
    'TraceInfo', 'build_tracer', 'trace_task',
@@ -515,6 +516,8 @@ def _trace_task_ret(name, uuid, request, body, content_type,
    R, I, T, Rstr = trace_task(app.tasks[name],
                               uuid, args, kwargs, request, app=app)
    return (1, R, T) if I else (0, Rstr, T)


trace_task_ret = _trace_task_ret  # noqa: E305

celery/app/utils.py

@@ -5,7 +5,6 @@
import os
import platform as _platform
import re

from collections import Mapping, namedtuple
from copy import deepcopy
from types import ModuleType
@@ -16,13 +15,11 @@
from celery.five import items, keys, string_t, values
from celery.platforms import pyimplementation
from celery.utils.collections import ConfigurationView
from celery.utils.imports import import_from_cwd, qualname, symbol_by_name
from celery.utils.text import pretty
from celery.utils.imports import import_from_cwd, symbol_by_name, qualname

from .defaults import (
    _TO_NEW_KEY, _TO_OLD_KEY, _OLD_DEFAULTS, _OLD_SETTING_KEYS,
    DEFAULTS, SETTING_KEYS, find,
)
from .defaults import (_OLD_DEFAULTS, _OLD_SETTING_KEYS, _TO_NEW_KEY,
                       _TO_OLD_KEY, DEFAULTS, SETTING_KEYS, find)

__all__ = [
    'Settings', 'appstr', 'bugreport',