From: Sergey M․ Date: Sun, 11 Jun 2017 18:50:32 +0000 (+0700) Subject: [compat] Introduce compat_HTMLParseError X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=72b409559c984bb116015ada55acd38120b24cc0;p=youtube-dl [compat] Introduce compat_HTMLParseError --- diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py index 39527117f..bbc499eda 100644 --- a/youtube_dl/compat.py +++ b/youtube_dl/compat.py @@ -2322,6 +2322,19 @@ try: except ImportError: # Python 2 from HTMLParser import HTMLParser as compat_HTMLParser +try: # Python 2 + from HTMLParser import HTMLParseError as compat_HTMLParseError +except ImportError: # Python <3.4 + try: + from html.parser import HTMLParseError as compat_HTMLParseError + except ImportError: # Python >3.4 + + # HTMLParseError has been deprecated in Python 3.3 and removed in + # Python 3.5. Introducing dummy exception for Python >3.5 for compatible + # and uniform cross-version exceptiong handling + class compat_HTMLParseError(Exception): + pass + try: from subprocess import DEVNULL compat_subprocess_get_DEVNULL = lambda: DEVNULL