rearranged caption helpers

pytube/captions.py

@@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-
 """This module contrains a container for caption tracks."""
+import math
+import time
+import xml.etree.ElementTree as ElementTree
+
 from pytube import request
-from pytube.helpers import xml_caption_to_srt
+from pytube.compat import unescape
 
 
 class Caption:
@@ -28,7 +32,52 @@ class Caption:
         Takes the xml captions from :meth:`~pytube.Caption.xml_captions` and
         recompiles them into the "SubRip Subtitle" format.
         """
-        return xml_caption_to_srt(self.xml_captions)
+        return self.xml_caption_to_srt(self.xml_captions)
+
+    def float_to_srt_time_format(self, d):
+        """Convert decimal durations into proper srt format.
+
+        :rtype: str
+        :returns:
+            SubRip Subtitle (str) formatted time duration.
+
+        >>> float_to_srt_time_format(3.89)
+        '00:00:03,890'
+        """
+        frac, whole = math.modf(d)
+        time_fmt = time.strftime('0%H:0%M:%S,', time.gmtime(whole))
+        ms = '{:.3f}'.format(frac).replace('0.', '')
+        return time_fmt + ms
+
+    def xml_caption_to_srt(self, xml_captions):
+        """Convert xml caption tracks to "SubRip Subtitle (srt)".
+
+        :param str xml_captions:
+            XML formatted caption tracks.
+        """
+        segments = []
+        root = ElementTree.fromstring(xml_captions)
+        for i, child in enumerate(root.getchildren()):
+            text = child.text or ''
+            caption = unescape(
+                text
+                .replace('\n', ' ')
+                .replace('  ', ' '),
+            )
+            duration = float(child.attrib['dur'])
+            start = float(child.attrib['start'])
+            end = start + duration
+            sequence_number = i + 1  # convert from 0-indexed to 1.
+            line = (
+                '{seq}\n{start} --> {end}\n{text}\n'.format(
+                    seq=sequence_number,
+                    start=self.float_to_srt_time_format(start),
+                    end=self.float_to_srt_time_format(end),
+                    text=caption,
+                )
+            )
+            segments.append(line)
+        return '\n'.join(segments).strip()
 
     def __repr__(self):
         """Printable object representation."""

pytube/helpers.py

@@ -3,13 +3,9 @@
 from __future__ import absolute_import
 
 import logging
-import math
 import pprint
 import re
-import time
-import xml.etree.ElementTree as ElementTree
 
-from pytube.compat import unescape
 from pytube.compat import unicode
 from pytube.exceptions import RegexMatchError
 
@@ -92,50 +88,3 @@ def safe_filename(s, max_length=255):
     regex = re.compile(pattern, re.UNICODE)
     filename = regex.sub('', s)
     return unicode(filename[:max_length].rsplit(' ', 0)[0])
-
-
-def float_to_srt_time_format(d):
-    """Convert decimal durations into proper srt format.
-
-    :rtype: str
-    :returns:
-        SubRip Subtitle (str) formatted time duration.
-
-    >>> float_to_srt_time_format(3.89)
-    '00:00:03,890'
-    """
-    frac, whole = math.modf(d)
-    time_fmt = time.strftime('0%H:0%M:%S,', time.gmtime(whole))
-    ms = '{:.3f}'.format(frac).replace('0.', '')
-    return time_fmt + ms
-
-
-def xml_caption_to_srt(xml_captions):
-    """Convert xml caption tracks to "SubRip Subtitle (srt)".
-
-    :param str xml_captions:
-        XML formatted caption tracks.
-    """
-    segments = []
-    root = ElementTree.fromstring(xml_captions)
-    for i, child in enumerate(root.getchildren()):
-        text = child.text or ''
-        caption = unescape(
-            text
-            .replace('\n', ' ')
-            .replace('  ', ' '),
-        )
-        duration = float(child.attrib['dur'])
-        start = float(child.attrib['start'])
-        end = start + duration
-        sequence_number = i + 1  # convert from 0-indexed to 1.
-        line = (
-            '{seq}\n{start} --> {end}\n{text}\n'.format(
-                seq=sequence_number,
-                start=float_to_srt_time_format(start),
-                end=float_to_srt_time_format(end),
-                text=caption,
-            )
-        )
-        segments.append(line)
-    return '\n'.join(segments).strip()