From: Sergey M․ <dstftw@gmail.com>
Date: Sun, 7 Aug 2016 08:59:05 +0000 (+0700)
Subject: [tnaflixnetworkbase] Improve title extraction
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=a1aadd09a4721ffd4d782aae4ddeae2699ca17fa;p=youtube-dl

[tnaflixnetworkbase] Improve title extraction
---

diff --git a/youtube_dl/extractor/tnaflix.py b/youtube_dl/extractor/tnaflix.py
index 74a0c8f17..7ddf77767 100644
--- a/youtube_dl/extractor/tnaflix.py
+++ b/youtube_dl/extractor/tnaflix.py
@@ -118,8 +118,12 @@ class TNAFlixNetworkBaseIE(InfoExtractor):
             xpath_text(cfg_xml, './startThumb', 'thumbnail'), 'http:')
         thumbnails = self._extract_thumbnails(cfg_xml)
 
-        title = self._html_search_regex(
-            self._TITLE_REGEX, webpage, 'title') if self._TITLE_REGEX else self._og_search_title(webpage)
+        title = None
+        if self._TITLE_REGEX:
+            title = self._html_search_regex(
+                self._TITLE_REGEX, webpage, 'title', default=None)
+        if not title:
+            title = self._og_search_title(webpage)
 
         age_limit = self._rta_search(webpage) or 18