diff options
| author | Aditi <aditi.iitr@gmail.com> | 2013-07-16 06:48:33 +0530 |
|---|---|---|
| committer | Aditi <aditi.iitr@gmail.com> | 2013-07-16 06:48:33 +0530 |
| commit | 67d303ffa96a80da3a3cf48d2f9231bc1a087a19 (patch) | |
| tree | 8bd1af9ec13fed7c340a6329632bddf2d17e3fb6 /mediagoblin/gmg_commands/import_export.py | |
| parent | 7b77f7e490a27de57a4dab5301662ef95d11b213 (diff) | |
| parent | 64ad0beea83b1f4b50462bcb67c54156fc9365a5 (diff) | |
| download | mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.tar.lz mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.tar.xz mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.zip | |
merge with remote master branch of cweb.
Diffstat (limited to 'mediagoblin/gmg_commands/import_export.py')
| -rw-r--r-- | mediagoblin/gmg_commands/import_export.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/gmg_commands/import_export.py b/mediagoblin/gmg_commands/import_export.py index d51a1e3e..98ec617d 100644 --- a/mediagoblin/gmg_commands/import_export.py +++ b/mediagoblin/gmg_commands/import_export.py @@ -63,7 +63,7 @@ def _import_media(db, args): # TODO: Add import of queue files queue_cache = BasicFileStorage(args._cache_path['queue']) - for entry in db.MediaEntry.find(): + for entry in db.MediaEntry.query.filter_by(): for name, path in entry.media_files.items(): _log.info('Importing: {0} - {1}'.format( entry.title.encode('ascii', 'replace'), @@ -204,7 +204,7 @@ def _export_media(db, args): # TODO: Add export of queue files queue_cache = BasicFileStorage(args._cache_path['queue']) - for entry in db.MediaEntry.find(): + for entry in db.MediaEntry.query.filter_by(): for name, path in entry.media_files.items(): _log.info(u'Exporting {0} - {1}'.format( entry.title, |