diff options
| author | Aditi <aditi.iitr@gmail.com> | 2013-07-31 19:15:20 +0530 |
|---|---|---|
| committer | Aditi <aditi.iitr@gmail.com> | 2013-07-31 19:15:20 +0530 |
| commit | af2f28033be564af0609cfac54c9ae3dbe2cdb42 (patch) | |
| tree | 252bb7d5da4f0b8fd3a3adb208322d21d85e0a78 | |
| parent | ef010b6453d1a4152abe6869b0b019ee1fb3dc6b (diff) | |
| parent | a1e299d60e135905e39358fe5dc1efcd64172daf (diff) | |
| download | mediagoblin-af2f28033be564af0609cfac54c9ae3dbe2cdb42.tar.lz mediagoblin-af2f28033be564af0609cfac54c9ae3dbe2cdb42.tar.xz mediagoblin-af2f28033be564af0609cfac54c9ae3dbe2cdb42.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
| -rw-r--r-- | mediagoblin/media_types/audio/__init__.py | 3 | ||||
| -rw-r--r-- | mediagoblin/tools/session.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
3 files changed, 5 insertions, 2 deletions
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' 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__) @@ -52,7 +52,7 @@ setup( 'kombu==2.1.7', 'jinja2', 'sphinx', - 'Babel', + 'Babel<1.0', 'argparse', 'webtest<2', 'ConfigObj', |