Cosmetics

celery/apps/worker.py

@@ -25,7 +25,7 @@ from kombu.utils.encoding import safe_str
 
 from celery import VERSION_BANNER, platforms, signals
 from celery.exceptions import CDeprecationWarning, SystemTerminate
-from celery.five import string, string_t, internal_string_t
+from celery.five import string, string_t
 from celery.loaders.app import AppLoader
 from celery.app import trace
 from celery.utils import cry, isatty
@@ -311,7 +311,7 @@ def _shutdown_handler(worker, sig='TERM', how='Warm',
                                 'Cold': 'should_terminate'}[how], True)
             else:
                 raise exc()
-    _handle_request.__name__ = internal_string_t('worker_{0}'.format(how))
+    _handle_request.__name__ = str('worker_{0}'.format(how))
     platforms.signals[sig] = _handle_request
 install_worker_term_handler = partial(
     _shutdown_handler, sig='SIGTERM', how='Warm', exc=SystemExit,

celery/five.py

@@ -58,7 +58,6 @@ if PY3:  # pragma: no cover
     map = map
     string = str
     string_t = str
-    internal_string_t = str  # used in fun.__name__ etc
     long_t = int
     text_t = str
     range = range
@@ -102,7 +101,6 @@ else:
     text_t = unicode
     long_t = long                   # noqa
     range = xrange
-    internal_string_t = str
     int_types = (int, long)
 
     open_fqdn = '__builtin__.open'