Drop backward compatibility for media_data backref.
authorElrond <elrond+mediagoblin.org@samba-tng.org>
Fri, 1 Feb 2013 15:33:53 +0000 (16:33 +0100)
committerElrond <elrond+mediagoblin.org@samba-tng.org>
Fri, 1 Feb 2013 21:02:35 +0000 (22:02 +0100)
Now we only support media_type backrefs with uselist=False.

mediagoblin/db/models.py

index c9bc3c1139619f0ab92e35a4a0ff4670b1f16e8b..10e0c33f4937fbb5d32ad33e3cfd440d49d70744 100644 (file)
@@ -20,7 +20,6 @@ TODO: indexes on foreignkeys, where useful.
 
 import logging
 import datetime
-from collections import Sequence
 
 from sqlalchemy import Column, Integer, Unicode, UnicodeText, DateTime, \
         Boolean, ForeignKey, UniqueConstraint, PrimaryKeyConstraint, \
@@ -197,14 +196,7 @@ class MediaEntry(Base, MediaEntryMixin):
 
     @property
     def media_data(self):
-        r = getattr(self, self.media_data_ref, None)
-        if isinstance(r, Sequence):
-            assert len(r) < 2
-            if r:
-                return r[0]
-            else:
-                return None
-        return r
+        return getattr(self, self.media_data_ref)
 
     def media_data_init(self, **kwargs):
         """