debian/changelog: Annotate bugs to close.

[youtubedl] / youtube_dl / compat.py

diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py
index e989cdbbd180abf4543726e86d088cd45225bfca..f9529210dd955932eca837aa7022696470c557ed 100644 (file)
--- a/youtube_dl/compat.py
+++ b/youtube_dl/compat.py
@@ -1,9 +1,11 @@
 from __future__ import unicode_literals
 
 from __future__ import unicode_literals
 

+import collections

 import getpass
 import optparse
 import os
 import re
 import getpass
 import optparse
 import os
 import re

+import shutil

 import socket
 import subprocess
 import sys
 import socket
 import subprocess
 import sys


@@ -44,11 +46,6 @@ try:
 except ImportError:  # Python 2
     import htmlentitydefs as compat_html_entities
 
 except ImportError:  # Python 2
     import htmlentitydefs as compat_html_entities
 

-try:
-    import html.parser as compat_html_parser
-except ImportError:  # Python 2
-    import HTMLParser as compat_html_parser
-

 try:
     import http.client as compat_http_client
 except ImportError:  # Python 2
 try:
     import http.client as compat_http_client
 except ImportError:  # Python 2


@@ -364,6 +361,33 @@ def workaround_optparse_bug9161():
             return real_add_option(self, *bargs, **bkwargs)
         optparse.OptionGroup.add_option = _compat_add_option
 
             return real_add_option(self, *bargs, **bkwargs)
         optparse.OptionGroup.add_option = _compat_add_option
 

+if hasattr(shutil, 'get_terminal_size'):  # Python >= 3.3
+    compat_get_terminal_size = shutil.get_terminal_size
+else:
+    _terminal_size = collections.namedtuple('terminal_size', ['columns', 'lines'])
+
+    def compat_get_terminal_size():
+        columns = compat_getenv('COLUMNS', None)
+        if columns:
+            columns = int(columns)
+        else:
+            columns = None
+        lines = compat_getenv('LINES', None)
+        if lines:
+            lines = int(lines)
+        else:
+            lines = None
+
+        try:
+            sp = subprocess.Popen(
+                ['stty', 'size'],
+                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            out, err = sp.communicate()
+            lines, columns = map(int, out.split())
+        except Exception:
+            pass
+        return _terminal_size(columns, lines)
+

 
 __all__ = [
     'compat_HTTPError',
 
 __all__ = [
     'compat_HTTPError',


@@ -371,10 +395,10 @@ __all__ = [
     'compat_chr',
     'compat_cookiejar',
     'compat_expanduser',
     'compat_chr',
     'compat_cookiejar',
     'compat_expanduser',

+    'compat_get_terminal_size',

     'compat_getenv',
     'compat_getpass',
     'compat_html_entities',
     'compat_getenv',
     'compat_getpass',
     'compat_html_entities',

-    'compat_html_parser',

     'compat_http_client',
     'compat_http_server',
     'compat_kwargs',
     'compat_http_client',
     'compat_http_server',
     'compat_kwargs',