heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Prevent non-Unicode SQLAlchemy warnings in most submission tests.

Browse Source 
This commit  makes test_submission mostly warning-clean.
This commit is contained in:
Brett Smith
2012-07-08 10:04:06 -04:00
parent c7dfd4fba6
commit 5bd0adebd0
7 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/db/mixin.py
View File

@@ -60,7 +60,7 @@ class MediaEntryMixin(object):
if duplicate:
if self.id is not None:
self.slug = "%s-%s" % (self.id, self.slug)
self.slug = u"%s-%s" % (self.id, self.slug)
else:
self.slug = None

4
mediagoblin/db/sql/models.py
View File

@@ -158,7 +158,7 @@ class MediaEntry(Base, MediaEntryMixin):
"""get the next 'newer' entry by this user"""
media = MediaEntry.query.filter(
(MediaEntry.uploader == self.uploader)
& (MediaEntry.state == 'processed')
& (MediaEntry.state == u'processed')
& (MediaEntry.id > self.id)).order_by(MediaEntry.id).first()
if media is not None:
@@ -168,7 +168,7 @@ class MediaEntry(Base, MediaEntryMixin):
"""get the next 'older' entry by this user"""
media = MediaEntry.query.filter(
(MediaEntry.uploader == self.uploader)
& (MediaEntry.state == 'processed')
& (MediaEntry.state == u'processed')
& (MediaEntry.id < self.id)).order_by(desc(MediaEntry.id)).first()
if media is not None: