From f6a700e8ae15f9b3368b908bded8129eb9345d7f Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Fri, 7 Mar 2014 15:19:23 +0200 Subject: Fix some compat issues in mediagoblin/db/models.py. --- mediagoblin/db/models.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mediagoblin/db/models.py') diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index b750375d..79389002 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -18,6 +18,8 @@ TODO: indexes on foreignkeys, where useful. """ +from __future__ import print_function + import logging import datetime @@ -371,7 +373,7 @@ class MediaEntry(Base, MediaEntryMixin): # Delete all related files/attachments try: delete_media_files(self) - except OSError, error: + except OSError as error: # Returns list of files we failed to delete _log.error('No such files from the user "{1}" to delete: ' '{0}'.format(str(error), self.get_uploader)) @@ -943,7 +945,7 @@ def show_table_init(engine_uri): if __name__ == '__main__': from sys import argv - print repr(argv) + print(repr(argv)) if len(argv) == 2: uri = argv[1] else: -- cgit v1.2.3 From 386c9c7c55147b27c258edd5deee36594553493d Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Mon, 26 May 2014 19:50:38 +0300 Subject: Use six.iteritems() instead of dict.iteritems(). --- mediagoblin/db/models.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mediagoblin/db/models.py') diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 79389002..1fecbaaa 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -40,6 +40,8 @@ from mediagoblin.db.mixin import UserMixin, MediaEntryMixin, \ from mediagoblin.tools.files import delete_media_files from mediagoblin.tools.common import import_component +import six + # It's actually kind of annoying how sqlalchemy-migrate does this, if # I understand it right, but whatever. Anyway, don't remove this :P # @@ -319,7 +321,7 @@ class MediaEntry(Base, MediaEntryMixin): file_metadata = media_file.file_metadata or {} - for key, value in kwargs.iteritems(): + for key, value in six.iteritems(kwargs): file_metadata[key] = value media_file.file_metadata = file_metadata @@ -344,7 +346,7 @@ class MediaEntry(Base, MediaEntryMixin): media_data.get_media_entry = self else: # Update old media data - for field, value in kwargs.iteritems(): + for field, value in six.iteritems(kwargs): setattr(media_data, field, value) @memoized_property -- cgit v1.2.3 From e49b7e02b2150413d2e78db709277fae0887be46 Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Mon, 2 Jun 2014 20:59:28 +0300 Subject: Use six.text_type instead of unicode(). I will be switch to use ``from __future__ import unicode_literals`` later. --- mediagoblin/db/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mediagoblin/db/models.py') diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 1fecbaaa..4b2fb632 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -304,7 +304,7 @@ class MediaEntry(Base, MediaEntryMixin): return the value of the key. """ media_file = MediaFile.query.filter_by(media_entry=self.id, - name=unicode(file_key)).first() + name=six.text_type(file_key)).first() if media_file: if metadata_key: @@ -317,7 +317,7 @@ class MediaEntry(Base, MediaEntryMixin): Update the file_metadata of a MediaFile. """ media_file = MediaFile.query.filter_by(media_entry=self.id, - name=unicode(file_key)).first() + name=six.text_type(file_key)).first() file_metadata = media_file.file_metadata or {} -- cgit v1.2.3 From e2cb0f86fe72c0f00335d7917ad23a5dd18d6e29 Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Fri, 27 Jun 2014 03:17:12 +0300 Subject: Remove sqlalchemy-migrate imports from the codebase. Do not touch tests yet. --- mediagoblin/db/models.py | 8 -------- 1 file changed, 8 deletions(-) (limited to 'mediagoblin/db/models.py') diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 4b2fb632..d3d1ec4b 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -42,17 +42,9 @@ from mediagoblin.tools.common import import_component import six -# It's actually kind of annoying how sqlalchemy-migrate does this, if -# I understand it right, but whatever. Anyway, don't remove this :P -# -# We could do migration calls more manually instead of relying on -# this import-based meddling... -from migrate import changeset - _log = logging.getLogger(__name__) - class User(Base, UserMixin): """ TODO: We should consider moving some rarely used fields -- cgit v1.2.3