decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

Remove redundant overrides of Model.delete

Browse source 
Both of these models have pre_delete handlers which do the same things,
so I think these are unnecessary.
This commit is contained in:
Will Thompson 2016-02-26 11:15:29 +00:00 committed by j
parent d69a8efd97
commit 2a07e2a1ab
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/archive/models.py
View file

@ -525,10 +525,6 @@ class File(models.Model):
status[name] = u'queued' status[name] = u'queued'
return status return status
def delete(self, *args, **kwargs):
self.delete_files()
super(File, self).delete(*args, **kwargs)
def delete_frames(self): def delete_frames(self):
frames = os.path.join(settings.MEDIA_ROOT, self.get_path('frames')) frames = os.path.join(settings.MEDIA_ROOT, self.get_path('frames'))
if os.path.exists(frames): if os.path.exists(frames):

4
pandora/item/models.py
View file

@ -436,10 +436,6 @@ class Item(models.Model):
if os.path.exists(path): if os.path.exists(path):
shutil.rmtree(path) shutil.rmtree(path)
def delete(self, *args, **kwargs):
self.delete_files()
super(Item, self).delete(*args, **kwargs)
def merge_with(self, other, save=True): def merge_with(self, other, save=True):
''' '''
move all related tables to other and delete self move all related tables to other and delete self