Merge tag 'upstream/2015.01.16'

[youtubedl] / youtube_dl / swfinterp.py

diff --git a/youtube_dl/swfinterp.py b/youtube_dl/swfinterp.py
index 99220940f8efde29180a22f035b9ceaeee46a11a..e60505ace8b8451666f2aeebea3277bc58cb6297 100644 (file)
--- a/youtube_dl/swfinterp.py
+++ b/youtube_dl/swfinterp.py
@@ -4,8 +4,8 @@ import collections
 import io
 import zlib
 
 import io
 import zlib
 

+from .compat import compat_str

 from .utils import (
 from .utils import (

-    compat_str,

     ExtractorError,
     struct_unpack,
 )
     ExtractorError,
     struct_unpack,
 )


@@ -827,4 +827,3 @@ class SWFInterpreter(object):
 
         avm_class.method_pyfunctions[func_name] = resfunc
         return resfunc
 
         avm_class.method_pyfunctions[func_name] = resfunc
         return resfunc

-