heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

Browse Source
This commit is contained in:
Aditi 2013-07-31 19:15:20 +05:30
commit af2f28033b
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/media_types/audio/__init__.py
View File

@ -19,6 +19,9 @@ from mediagoblin.media_types.audio.processing import process_audio, \
sniff_handler sniff_handler
from mediagoblin.tools import pluginapi 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"] ACCEPTED_EXTENSIONS = ["mp3", "flac", "wav", "m4a"]
MEDIA_TYPE = 'mediagoblin.media_types.audio' MEDIA_TYPE = 'mediagoblin.media_types.audio'

2
mediagoblin/tools/session.py
View File

@ -17,7 +17,7 @@
import itsdangerous import itsdangerous
import logging import logging
import crypto from mediagoblin.tools import crypto
_log = logging.getLogger(__name__) _log = logging.getLogger(__name__)

2
setup.py
View File

@ -52,7 +52,7 @@ setup(
'kombu==2.1.7', 'kombu==2.1.7',
'jinja2', 'jinja2',
'sphinx', 'sphinx',
'Babel', 'Babel<1.0',
'argparse', 'argparse',
'webtest<2', 'webtest<2',
'ConfigObj', 'ConfigObj',