Python3 compatibility. RentMethod#2

torotil · Mar 14, 2015 · eb5e751 · eb5e751
1 parent 42edb92
commit eb5e751
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/celerytest/__init__.py b/celerytest/__init__.py
@@ -1,9 +1,10 @@
-from config import CELERY_TEST_CONFIG, CELERY_TEST_CONFIG_MEMORY
-from worker import CeleryWorkerThread
+from .config import CELERY_TEST_CONFIG, CELERY_TEST_CONFIG_MEMORY
+from .worker import CeleryWorkerThread
 
 
 def setup_celery_worker(app, config=CELERY_TEST_CONFIG_MEMORY, concurrency=1):
-    conf = dict(CELERY_TEST_CONFIG.__dict__.items() + config.__dict__.items())
+    conf = dict(CELERY_TEST_CONFIG.__dict__.items())
+    conf.update(config.__dict__.items())
     conf['CELERYD_CONCURRENCY'] = concurrency
     app.config_from_object(conf)