Skip to content

Commit

Permalink
Subtitles: catch missing subtitle support
Browse files Browse the repository at this point in the history
Fail and provide a more useful report of missing imports.  This also
breaks out Python 2 vs Python 3 failures as aeidon is only available on
Python 3.

Fixes translate#3409
  • Loading branch information
dwaynebailey committed May 11, 2017
1 parent b8e20f5 commit 7e70338
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions translate/storage/subtitles.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,20 @@
SubStationAlpha, new)
from aeidon.util import detect_format as determine
except ImportError:
from gaupol import FormatDeterminer, documents
from gaupol.encodings import detect
from gaupol.files import (AdvSubStationAlpha, MicroDVD, SubRip,
SubStationAlpha, new)
from gaupol.newlines import newlines
from gaupol.subtitle import Subtitle
_determiner = FormatDeterminer()
determine = _determiner.determine
try:
from gaupol import FormatDeterminer, documents
from gaupol.encodings import detect
from gaupol.files import (AdvSubStationAlpha, MicroDVD, SubRip,
SubStationAlpha, new)
from gaupol.newlines import newlines
from gaupol.subtitle import Subtitle
_determiner = FormatDeterminer()
determine = _determiner.determine
except ImportError:
if six.PY3:
raise ImportError('\naeidon or gaupol package required for Subtitle support')
else:
raise ImportError('\ngaupol package required for Subtitle support')

from translate.storage import base

Expand Down

0 comments on commit 7e70338

Please sign in to comment.