From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 10 Jan 2015 04:47:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'lenaten/8tracks'
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=c24dfef63c55ef1a5424d11b485c3b76245448a4;p=youtube-dl.git

Merge remote-tracking branch 'lenaten/8tracks'
---

c24dfef63c55ef1a5424d11b485c3b76245448a4
diff --cc youtube_dl/extractor/eighttracks.py
index a30a1f330,f093592a8..9df2141c3
--- a/youtube_dl/extractor/eighttracks.py
+++ b/youtube_dl/extractor/eighttracks.py
@@@ -4,10 -4,12 +4,12 @@@ from __future__ import unicode_literal
  import json
  import random
  import re
+ import time
  
  from .common import InfoExtractor
 -from ..utils import (
 +from ..compat import (
      compat_str,
+     ExtractorError,
  )