diff --git a/pandora/archive/extract.py b/pandora/archive/extract.py index f206de24..514b29ce 100644 --- a/pandora/archive/extract.py +++ b/pandora/archive/extract.py @@ -619,7 +619,7 @@ def chop(video, start, end, subtitles=None): fd.write(subtitles) else: subtitles_f = None - if False and ext == '.mp4' and settings.CHOP_SUPPORT: + if ext == '.mp4' and settings.CHOP_SUPPORT: Chop(video, choped_video, start, end, subtitles_f) if subtitles_f: os.unlink(subtitles_f) diff --git a/pandora/settings.py b/pandora/settings.py index 8a6f588b..e0c7e7ee 100644 --- a/pandora/settings.py +++ b/pandora/settings.py @@ -274,7 +274,7 @@ except NameError: secret.write(SECRET_KEY) secret.close() except IOError: - raise Exception('Please create a %s file with random characters to generate your secret key!' % SECRET_FILE) + Exception('Please create a %s file with random characters to generate your secret key!' % SECRET_FILE) INSTALLED_APPS = tuple(list(INSTALLED_APPS) + LOCAL_APPS)