Vtk 2434 striprtf fonttbl support

.travis.yml

@@ -1,8 +1,9 @@
 language: python
 
 python:
-    - 3.4
-    - 3.5
+  - 2.7
+  - 3.4
+  - 3.5
 
 script: python setup.py test
 

MANIFEST.in

@@ -1,3 +1,5 @@
 include pycaption/english.pickle
+include pycaption/*.ttf
+include pycaption/*.otf
 recursive-exclude tests *
-include README.rst
+include README.rst requirements.txt

pycaption/__init__.py

@@ -1,7 +1,10 @@
+import bs4
+
 from .base import (
     CaptionConverter, CaptionNode, Caption, CaptionList, CaptionSet)
 from .dfxp import DFXPWriter, DFXPReader
 from .sami import SAMIReader, SAMIWriter
+from .scenarist import ScenaristDVDWriter
 from .srt import SRTReader, SRTWriter
 from .scc import SCCReader, SCCWriter
 from .webvtt import WebVTTReader, WebVTTWriter
@@ -14,7 +17,7 @@
     'SAMIReader', 'SAMIWriter', 'SRTReader', 'SRTWriter',
     'SCCReader', 'SCCWriter', 'WebVTTReader', 'WebVTTWriter',
     'CaptionReadError', 'CaptionReadNoCaptions', 'CaptionReadSyntaxError',
-    'detect_format', 'CaptionNode', 'Caption', 'CaptionList', 'CaptionSet'
+    'detect_format', 'CaptionNode', 'Caption', 'CaptionList', 'CaptionSet', 'ScenaristDVDWriter'
 ]
 
 SUPPORTED_READERS = (

pycaption/base.py

@@ -1,6 +1,5 @@
 from datetime import timedelta
 from numbers import Number
-from six import text_type
 
 from .exceptions import CaptionReadError, CaptionReadTimingError
 
@@ -232,7 +231,7 @@ def get_text_for_node(node):
     def _format_timestamp(self, value, msec_separator=None):
         datetime_value = timedelta(milliseconds=(int(value / 1000)))
 
-        str_value = text_type(datetime_value)[:11]
+        str_value = str(datetime_value)[:11]
         if not datetime_value.microseconds:
             str_value += '.000'
 

pycaption/dfxp/__init__.py

@@ -1,2 +1,2 @@
-from .base import *
-from .extras import SinglePositioningDFXPWriter, LegacyDFXPWriter
+from .base import *  # noqa: F401, F403
+from .extras import SinglePositioningDFXPWriter, LegacyDFXPWriter  # noqa: F401