Merge tag 'upstream/2016.02.22'

[youtubedl] / youtube_dl / swfinterp.py

diff --git a/youtube_dl/swfinterp.py b/youtube_dl/swfinterp.py
index 99220940f8efde29180a22f035b9ceaeee46a11a..06c1d6cc1755ef022aa78967d4b651e21fd66618 100644 (file)
--- a/youtube_dl/swfinterp.py
+++ b/youtube_dl/swfinterp.py
@@ -4,8 +4,8 @@ import collections
 import io
 import zlib
 
+from .compat import compat_str
 from .utils import (
-    compat_str,
     ExtractorError,
     struct_unpack,
 )
@@ -689,7 +689,7 @@ class SWFInterpreter(object):
                     elif mname in _builtin_classes:
                         res = _builtin_classes[mname]
                     else:
-                        # Assume unitialized
+                        # Assume uninitialized
                         # TODO warn here
                         res = undefined
                     stack.append(res)
@@ -827,4 +827,3 @@ class SWFInterpreter(object):
 
         avm_class.method_pyfunctions[func_name] = resfunc
         return resfunc
-