Skip to content

Commit 71a2996

Browse files
vedarthkauvipy
authored andcommitted
Fixes close method call when imp returns None in loaders (#502)
* Fixes close method call on None `imp.find_module` returns first argument as `None` if app_path is a module and not a file these changes will call close method only if the file is retuned more information: https://docs.python.org/2/library/imp.html#imp.find_module * Fixes flake8 errors
1 parent 65d1962 commit 71a2996

File tree

8 files changed

+11
-1
lines changed

8 files changed

+11
-1
lines changed

djcelery/admin.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ def get_actions(self, request):
239239
actions.pop('delete_selected', None)
240240
return actions
241241

242+
242243
admin.site.register(TaskState, TaskMonitor)
243244
admin.site.register(WorkerState, WorkerMonitor)
244245

djcelery/loaders.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,8 @@ def find_related_module(app, related_name):
191191

192192
try:
193193
f, _, _ = imp.find_module(related_name, app_path)
194-
f.close()
194+
# f is returned None when app_path is a module
195+
f and f.close()
195196
except ImportError:
196197
return
197198

djcelery/management/base.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ def _validate_thread_sharing(self):
5050
patch_thread_ident.called = True
5151
except ImportError:
5252
pass
53+
54+
5355
patch_thread_ident()
5456

5557

djcelery/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ def schedule(self):
295295
if self.crontab:
296296
return self.crontab.schedule
297297

298+
298299
signals.pre_delete.connect(PeriodicTasks.changed, sender=PeriodicTask)
299300
signals.pre_save.connect(PeriodicTasks.changed, sender=PeriodicTask)
300301

djcelery/mon.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,6 @@ def main(argv=sys.argv):
7272
management.call_command('migrate')
7373
run_monitor(argv)
7474

75+
7576
if __name__ == '__main__':
7677
main()

djcelery/picklefield.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ def get_db_prep_lookup(self, lookup_type, value, *args, **kwargs):
117117
return super(PickledObjectField, self) \
118118
.get_db_prep_lookup(*args, **kwargs)
119119

120+
120121
try:
121122
from south.modelsinspector import add_introspection_rules
122123
except ImportError:

djcelery/tests/test_admin.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
class MockRequest(object):
1313
pass
1414

15+
1516
request = MockRequest()
1617

1718
site = admin.AdminSite()

djcelery/tests/test_worker_job.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ def mytask(i):
2121
def get_db_connection(i):
2222
from django.db import connection
2323
return id(connection)
24+
25+
2426
get_db_connection.ignore_result = True
2527

2628

0 commit comments

Comments
 (0)