0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:40f5de20d2df5d23cd10881b3dea84ccb2a3d990
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:d4881197480599371cdef781b7fc316e31b9160c
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "40f5de20d2df5d23cd10881b3dea84ccb2a3d990" and "d4881197480599371cdef781b7fc316e31b9160c" have entirely different histories.
40f5de20d2 ... d488119748

2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pandora/archive/extract.py
View file

@ -619,7 +619,7 @@ def chop(video, start, end, subtitles=None):
fd.write(subtitles) fd.write(subtitles)
else: else:
subtitles_f = None 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) Chop(video, choped_video, start, end, subtitles_f)
if subtitles_f: if subtitles_f:
os.unlink(subtitles_f) os.unlink(subtitles_f)

2
pandora/settings.py
View file

@ -274,7 +274,7 @@ except NameError:
secret.write(SECRET_KEY) secret.write(SECRET_KEY)
secret.close() secret.close()
except IOError: 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) INSTALLED_APPS = tuple(list(INSTALLED_APPS) + LOCAL_APPS)