aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2013-02-01 16:33:53 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2013-02-01 22:02:35 +0100
commit485404a9c42b09f0fda38aeb8d1242f24ccfa143 (patch)
treeb26481d49258c1346d6f104b25ed19470d4ffa24
parent139c6c099fdbf139d2441db0c1a774081394a47d (diff)
downloadmediagoblin-485404a9c42b09f0fda38aeb8d1242f24ccfa143.tar.lz
mediagoblin-485404a9c42b09f0fda38aeb8d1242f24ccfa143.tar.xz
mediagoblin-485404a9c42b09f0fda38aeb8d1242f24ccfa143.zip
Drop backward compatibility for media_data backref.
Now we only support media_type backrefs with uselist=False.
-rw-r--r--mediagoblin/db/models.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index c9bc3c11..10e0c33f 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -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):
"""