From 130b85f81ac297ebb769ab133c8adb1647d794a8 Mon Sep 17 00:00:00 2001 From: Rodney Ewing Date: Mon, 29 Jul 2013 11:25:34 -0700 Subject: [PATCH 1/2] babel 1.0 doesn't have a localedata.list() method, so updated setup.py. made "import crypto" fully qualified --- mediagoblin/tools/session.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mediagoblin/tools/session.py b/mediagoblin/tools/session.py index d79afb66..a57f69cc 100644 --- a/mediagoblin/tools/session.py +++ b/mediagoblin/tools/session.py @@ -17,7 +17,7 @@ import itsdangerous import logging -import crypto +from mediagoblin.tools import crypto _log = logging.getLogger(__name__) diff --git a/setup.py b/setup.py index 6e026f30..14a9a24f 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ setup( 'kombu==2.1.7', 'jinja2', 'sphinx', - 'Babel', + 'Babel<1.0', 'argparse', 'webtest<2', 'ConfigObj', From a1e299d60e135905e39358fe5dc1efcd64172daf Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 29 Jul 2013 16:50:29 -0500 Subject: [PATCH 2/2] Why isn't .ogg in this list? A comment explains... it's detected by sniffing! This commit sponsored by Tom Marble. Thanks Tom! --- mediagoblin/media_types/audio/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mediagoblin/media_types/audio/__init__.py b/mediagoblin/media_types/audio/__init__.py index 90f842ba..c7ed8d2d 100644 --- a/mediagoblin/media_types/audio/__init__.py +++ b/mediagoblin/media_types/audio/__init__.py @@ -19,6 +19,9 @@ from mediagoblin.media_types.audio.processing import process_audio, \ sniff_handler from mediagoblin.tools import pluginapi +# Why isn't .ogg in this list? It's still detected, but via sniffing, +# .ogg files could be either video or audio... sniffing determines which. + ACCEPTED_EXTENSIONS = ["mp3", "flac", "wav", "m4a"] MEDIA_TYPE = 'mediagoblin.media_types.audio'