merging changes

pandora/clip/models.py

@@ -5,8 +5,6 @@ from __future__ import division, with_statement
 from django.db import models
 from django.conf import settings
 
-import ox
-
 from archive import extract
 import managers
 
@@ -50,9 +48,6 @@ class Clip(models.Model):
             self.update_calculated_values()
         super(Clip, self).save(*args, **kwargs)
 
-    def set_public_id(self):
-        self.public_id = u"%s/%s-%s" %(self.item.itemId, self.start, self.end)
-
     def json(self, keys=None):
         j = {}
         for field in ('id', 'in', 'out', 'created', 'modified',