Bladeren bron

PEP8 + pyflakes

Ask Solem 15 jaren geleden
bovenliggende
commit
e6825ed635
6 gewijzigde bestanden met toevoegingen van 8 en 9 verwijderingen
  1. 0 1
      celery/apps/beat.py
  2. 2 3
      celery/loaders/base.py
  3. 3 2
      celery/log.py
  4. 1 1
      celery/schedules.py
  5. 0 1
      celery/tests/test_routes.py
  6. 2 1
      celery/worker/listener.py

+ 0 - 1
celery/apps/beat.py

@@ -5,7 +5,6 @@ import traceback
 from celery import __version__
 from celery import beat
 from celery import platforms
-from celery.log import emergency_error
 from celery.utils import get_full_cls_name, info, LOG_LEVELS
 from celery.utils.info import humanize_seconds
 from celery.utils import term

+ 2 - 3
celery/loaders/base.py

@@ -77,11 +77,10 @@ class BaseLoader(object):
                 sys.path.remove(cwd)
             except ValueError:          # pragma: no cover
                 pass
-    
+
     def mail_admins(self, subject, body, fail_silently=False):
         return mail_admins(subject, body, fail_silently=fail_silently)
-    
-    
+
     @property
     def conf(self):
         """Loader configuration."""

+ 3 - 2
celery/log.py

@@ -37,14 +37,15 @@ class ColorFormatter(logging.Formatter):
     def formatException(self, ei):
         r = logging.Formatter.formatException(self, ei)
         if type(r) in [types.StringType]:
-            r = r.decode('utf-8', 'replace') # Convert to unicode
+            r = r.decode('utf-8', 'replace')    # convert to unicode
         return r
 
     def format(self, record):
         levelname = record.levelname
 
         if self.use_color and levelname in COLORS:
-            record.msg = unicode(colored().names[COLORS[levelname]](record.msg))
+            record.msg = unicode(colored().names[COLORS[levelname]](
+                            record.msg))
 
         # Very ugly, but have to make sure processName is supported
         # by foreign logger instances.

+ 1 - 1
celery/schedules.py

@@ -251,7 +251,7 @@ class crontab(schedule):
     def remaining_estimate(self, last_run_at):
         """Returns when the periodic task should run next as a timedelta."""
         weekday = last_run_at.isoweekday()
-        if weekday == 7: # Sunday is day 0, not day 7.
+        if weekday == 7:    # sunday is day 0, not day 7.
             weekday = 0
 
         execute_this_hour = (weekday in self.day_of_week and

+ 0 - 1
celery/tests/test_routes.py

@@ -94,7 +94,6 @@ class test_lookup_route(unittest.TestCase):
                                        route)
         self.assertNotIn("queue", route)
 
-
     @with_queues(foo=a_queue, bar=b_queue)
     def test_lookup_paths_traversed(self):
         R = routes.prepare(({"celery.xaza": {"queue": "bar"}},

+ 2 - 1
celery/worker/listener.py

@@ -276,7 +276,8 @@ class CarrotListener(object):
             except OverflowError, exc:
                 self.logger.error(
                     "Couldn't convert eta %s to timestamp: %r. Task: %r" % (
-                        task.eta, exc, task.info(safe=True)), exc_info=sys.exc_info())
+                        task.eta, exc, task.info(safe=True)),
+                        exc_info=sys.exc_info())
                 task.acknowledge()
             else:
                 self.qos.increment()