Renames .utils.timeutils -> .utils.time

CONTRIBUTING.rst

@@ -736,7 +736,7 @@ is following the conventions.
 
         from .platforms import Pidfile
         from .five import zip_longest, items, range
-        from .utils import timeutils
+        from .utils.time import maybe_timedelta
 
 * Wild-card imports must not be used (`from xxx import *`).
 

celery/app/amqp.py

@@ -21,7 +21,7 @@ from celery.local import try_import
 from celery.utils.nodenames import anon_nodename
 from celery.utils.saferepr import saferepr
 from celery.utils.text import indent as textindent
-from celery.utils.timeutils import maybe_make_aware, to_utc
+from celery.utils.time import maybe_make_aware, to_utc
 
 from . import routes as _routes
 

celery/app/base.py

@@ -36,7 +36,7 @@ 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.timeutils import timezone
+from celery.utils.time import timezone
 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

celery/apps/beat.py

@@ -17,7 +17,7 @@ from celery import VERSION_BANNER, platforms, beat
 from celery.five import text_t
 from celery.utils.imports import qualname
 from celery.utils.log import LOG_LEVELS, get_logger
-from celery.utils.timeutils import humanize_seconds
+from celery.utils.time import humanize_seconds
 
 __all__ = ['Beat']
 

celery/backends/database/__init__.py

@@ -12,7 +12,7 @@ from celery import states
 from celery.backends.base import BaseBackend
 from celery.exceptions import ImproperlyConfigured
 from celery.five import range
-from celery.utils.timeutils import maybe_timedelta
+from celery.utils.time import maybe_timedelta
 
 from .models import Task
 from .models import TaskSet

celery/backends/redis.py

@@ -16,7 +16,7 @@ from celery.five import string_t
 from celery.utils import deprecated
 from celery.utils.functional import dictfilter
 from celery.utils.log import get_logger
-from celery.utils.timeutils import humanize_seconds
+from celery.utils.time import humanize_seconds
 
 from . import async
 from . import base

celery/backends/rpc.py

@@ -17,7 +17,7 @@ from celery import states
 from celery._state import task_join_will_block
 from celery.five import items, range
 from celery.utils.functional import dictfilter
-from celery.utils.timeutils import maybe_s_to_ms
+from celery.utils.time import maybe_s_to_ms
 
 from . import base
 from .async import AsyncBackendMixin, BaseResultConsumer

celery/beat.py

@@ -28,7 +28,7 @@ from .five import (
 )
 from .schedules import maybe_schedule, crontab
 from .utils.imports import load_extension_class_names, symbol_by_name
-from .utils.timeutils import humanize_seconds
+from .utils.time import humanize_seconds
 from .utils.log import get_logger, iter_open_logger_fds
 
 __all__ = [

celery/bin/celery.py

@@ -274,7 +274,7 @@ from celery.utils import term
 from celery.utils import text
 from celery.utils.functional import pass1
 from celery.utils.text import str_to_list
-from celery.utils.timeutils import maybe_iso8601
+from celery.utils.time import maybe_iso8601
 
 # Cannot use relative imports here due to a Windows issue (#1111).
 from celery.bin.base import Command, Option, Extensions

celery/events/__init__.py

@@ -26,7 +26,7 @@ from celery.app import app_or_default
 from celery.five import items
 from celery.utils.functional import dictfilter
 from celery.utils.nodenames import anon_nodename
-from celery.utils.timeutils import adjust_timestamp, utcoffset, maybe_s_to_ms
+from celery.utils.time import adjust_timestamp, utcoffset, maybe_s_to_ms
 
 __all__ = ['Events', 'Event', 'EventDispatcher', 'EventReceiver']
 

celery/events/dumper.py

@@ -12,7 +12,7 @@ from datetime import datetime
 
 from celery.app import app_or_default
 from celery.utils.functional import LRUCache
-from celery.utils.timeutils import humanize_seconds
+from celery.utils.time import humanize_seconds
 
 __all__ = ['Dumper', 'evdump']
 

celery/events/snapshot.py

@@ -17,7 +17,7 @@ from celery.utils.timer2 import Timer
 from celery.utils.dispatch import Signal
 from celery.utils.imports import instantiate
 from celery.utils.log import get_logger
-from celery.utils.timeutils import rate
+from celery.utils.time import rate
 
 __all__ = ['Polaroid', 'evcam']
 

celery/schedules.py

@@ -14,7 +14,7 @@ from kombu.utils.objects import cached_property
 from . import current_app
 from .five import python_2_unicode_compatible, range, string_t
 from .utils.collections import AttributeDict
-from .utils.timeutils import (
+from .utils.time import (
     weekday, maybe_timedelta, remaining, humanize_seconds,
     timezone, maybe_make_aware, ffwd, localize
 )
@@ -431,7 +431,7 @@ class crontab(schedule):
 
     def _delta_to_next(self, last_run_at, next_hour, next_minute):
         """Takes a :class:`~datetime.datetime` of last run, next minute and hour,
-        and returns a :class:`~celery.utils.timeutils.ffwd` for the next
+        and returns a :class:`~celery.utils.time.ffwd` for the next
         scheduled day and time.
 
         Only called when ``day_of_month`` and/or ``month_of_year``

celery/tests/app/test_amqp.py

@@ -7,7 +7,7 @@ from kombu import Exchange, Queue
 from celery import uuid
 from celery.app.amqp import Queues, utf8dict
 from celery.five import keys
-from celery.utils.timeutils import to_utc
+from celery.utils.time import to_utc
 
 from celery.tests.case import AppCase, Mock
 

celery/tests/app/test_app.py

@@ -21,7 +21,7 @@ from celery.loaders.base import unconfigured
 from celery.platforms import pyimplementation
 from celery.utils.collections import DictAttribute
 from celery.utils.serialization import pickle
-from celery.utils.timeutils import timezone
+from celery.utils.time import timezone
 from celery.utils.objects import Bunch
 
 from celery.tests.case import (

celery/tests/tasks/test_tasks.py

@@ -11,7 +11,7 @@ from celery.app.task import _reprtask
 from celery.exceptions import Ignore, Retry
 from celery.five import items, range, string_t
 from celery.result import EagerResult
-from celery.utils.timeutils import parse_iso8601
+from celery.utils.time import parse_iso8601
 
 from celery.tests.case import (
     AppCase, ContextMock, MagicMock, Mock, depends_on_current_app, patch,

celery/tests/utils/test_timeutils.py

@@ -5,7 +5,7 @@ import pytz
 from datetime import datetime, timedelta, tzinfo
 from pytz import AmbiguousTimeError
 
-from celery.utils.timeutils import (
+from celery.utils.time import (
     delta_resolution,
     humanize_seconds,
     maybe_iso8601,
@@ -27,7 +27,7 @@ from celery.tests.case import Case, Mock, patch
 class test_LocalTimezone(Case):
 
     def test_daylight(self):
-        with patch('celery.utils.timeutils._time') as time:
+        with patch('celery.utils.time._time') as time:
             time.timezone = 3600
             time.daylight = False
             x = LocalTimezone()
@@ -70,7 +70,7 @@ class test_iso8601(Case):
         self.assertEqual(d3.tzinfo, pytz.UTC)
 
 
-class test_timeutils(Case):
+class test_time_utils(Case):
 
     def test_delta_resolution(self):
         D = delta_resolution
@@ -246,7 +246,7 @@ class test_ffwd(Case):
 class test_utcoffset(Case):
 
     def test_utcoffset(self):
-        with patch('celery.utils.timeutils._time') as _time:
+        with patch('celery.utils.time._time') as _time:
             _time.daylight = True
             self.assertIsNotNone(utcoffset(time=_time))
             _time.daylight = False

celery/tests/worker/test_strategy.py

@@ -8,7 +8,7 @@ from kombu.utils.limits import TokenBucket
 from celery.exceptions import InvalidTaskError
 from celery.worker import state
 from celery.worker.strategy import proto1_to_proto2
-from celery.utils.timeutils import rate
+from celery.utils.time import rate
 
 from celery.tests.case import (
     AppCase, Mock, TaskMessage, TaskMessage1, patch, task_message_from_sig,

celery/worker/consumer/consumer.py

@@ -32,7 +32,7 @@ from celery.utils.log import get_logger
 from celery.utils.nodenames import gethostname
 from celery.utils.objects import Bunch
 from celery.utils.text import truncate
-from celery.utils.timeutils import humanize_seconds, rate
+from celery.utils.time import humanize_seconds, rate
 
 from celery.worker import loops
 from celery.worker.state import (

celery/worker/control.py

@@ -13,10 +13,10 @@ from kombu.utils.encoding import safe_repr
 from celery.exceptions import WorkerShutdown
 from celery.five import UserDict, items, string_t, text_t
 from celery.platforms import signals as _signals
-from celery.utils import timeutils
 from celery.utils.functional import maybe_list
 from celery.utils.log import get_logger
 from celery.utils.serialization import jsonify, strtobool
+from celery.utils.time import rate
 
 from . import state as worker_state
 from .request import Request
@@ -196,7 +196,7 @@ def rate_limit(state, task_name, rate_limit, **kwargs):
         rate_limit (int, str): New rate limit.
     """
     try:
-        timeutils.rate(rate_limit)
+        rate(rate_limit)
     except ValueError as exc:
         return nok('Invalid rate limit string: {0!r}'.format(exc))
 

celery/worker/request.py

@@ -25,7 +25,7 @@ from celery.platforms import signals as _signals
 from celery.utils.functional import maybe, noop
 from celery.utils.log import get_logger
 from celery.utils.nodenames import gethostname
-from celery.utils.timeutils import maybe_iso8601, timezone, maybe_make_aware
+from celery.utils.time import maybe_iso8601, timezone, maybe_make_aware
 from celery.utils.serialization import get_pickled_exception
 
 from . import state

celery/worker/strategy.py

@@ -10,7 +10,7 @@ from kombu.five import buffer_t
 from celery.exceptions import InvalidTaskError
 from celery.utils.log import get_logger
 from celery.utils.saferepr import saferepr
-from celery.utils.timeutils import timezone
+from celery.utils.time import timezone
 
 from .request import Request, create_request_cls
 from .state import task_reserved

docs/contributing.rst

@@ -765,7 +765,7 @@ is following the conventions.
 
         from .platforms import Pidfile
         from .five import zip_longest, items, range
-        from .utils import timeutils
+        from .utils.time import maybe_timedelta
 
 * Wild-card imports must not be used (`from xxx import *`).
 

docs/internals/app-overview.rst

@@ -155,7 +155,7 @@ Aliases (Pending deprecation)
     * ``.inspect`` -> {``app.control.inspect``}
 
 * ``celery.utils.info``
-    * ``.humanize_seconds`` -> ``celery.utils.timeutils.humanize_seconds``
+    * ``.humanize_seconds`` -> ``celery.utils.time.humanize_seconds``
     * ``.textindent`` -> ``celery.utils.textindent``
     * ``.get_broker_info`` -> {``app.amqp.get_broker_info``}
     * ``.format_broker_info`` -> {``app.amqp.format_broker_info``}

docs/internals/reference/celery.utils.timeutils.rst → docs/internals/reference/celery.utils.time.rst

@@ -1,11 +1,11 @@
 ==================================================
- ``celery.utils.timeutils``
+ ``celery.utils.time``
 ==================================================
 
 .. contents::
     :local:
-.. currentmodule:: celery.utils.timeutils
+.. currentmodule:: celery.utils.time
 
-.. automodule:: celery.utils.timeutils
+.. automodule:: celery.utils.time
     :members:
     :undoc-members:

docs/internals/reference/index.rst

@@ -56,7 +56,7 @@
     celery.utils.graph
     celery.utils.objects
     celery.utils.term
-    celery.utils.timeutils
+    celery.utils.time
     celery.utils.iso8601
     celery.utils.saferepr
     celery.utils.serialization

docs/whatsnew-4.0.rst

@@ -1693,6 +1693,8 @@ Changes to internal API
 
 - Module ``celery.datastructures`` renamed to :mod:`celery.utils.collections`.
 
+- Module ``celery.utils.timeutils`` renamed to :mod:`celery.utils.time`.
+
 - ``celery.utils.datastructures.DependencyGraph`` moved to
   :mod:`celery.utils.graph`.