commit de6b03d3753a77b2babc18a6c9ae0d1ef3ab293c Author: Richard Shaw <hobbes1069(a)gmail.com&gt; Date: Sat Nov 2 10:06:31 2019 -0500 Add missing Python 3 patch. mythtv-py3_urllib.patch | 68 ++++++++++++++++++++++++------------------------- mythtv.spec | 1 + 2 files changed, 35 insertions(+), 34 deletions(-) --- diff --git a/mythtv-py3_urllib.patch b/mythtv-py3_urllib.patch index 6720628..42975ef 100644 --- a/mythtv-py3_urllib.patch +++ b/mythtv-py3_urllib.patch @@ -1,5 +1,5 @@ ---- mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py (original) -+++ mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py (refactored) +--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py (original) ++++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py (refactored) @@ -37,7 +37,7 @@ import os, struct, sys, re, time @@ -45,8 +45,8 @@ metadata['link'] = metadata['video'] # !! This tag will need to be added at a later date # metadata['customhtml'] = u'true' ---- mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_api.py (original) -+++ mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_api.py (refactored) +--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_api.py (original) ++++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_api.py (refactored) @@ -37,7 +37,7 @@ # 0.3.0 Adapted to the v3 API @@ -102,8 +102,8 @@ pagenumber) if self.config['debug_enabled']: print url ---- mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_api.py (original) -+++ mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_api.py (refactored) +--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_api.py (original) ++++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_api.py (refactored) @@ -35,7 +35,7 @@ @@ -159,8 +159,8 @@ if self.config['debug_enabled']: print url print ---- mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_api.py (original) -+++ mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_api.py (refactored) +--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_api.py (original) ++++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_api.py (refactored) @@ -55,7 +55,7 @@ Python module to interact with Vimeo through its API (version 2) """ @@ -179,8 +179,8 @@ sort='most_liked', per_page=pagelen, page=pagenumber) ---- mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py (original) -+++ mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py (refactored) +--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py (original) ++++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py (refactored) @@ -38,7 +38,7 @@ # Removed a subdirectory level as the "Featured" RSS feed has been discontinued @@ -236,8 +236,8 @@ if self.config['debug_enabled']: print "Search URL:" ---- mythtv/programs/scripts/hardwareprofile/request.py (original) -+++ mythtv/programs/scripts/hardwareprofile/request.py (refactored) +--- a/mythtv/programs/scripts/hardwareprofile/request.py (original) ++++ b/mythtv/programs/scripts/hardwareprofile/request.py (refactored) @@ -21,15 +21,15 @@ # providing the base url, user agent, and proxy information. # The object returned is slightly modified, with a shortcut to urlopen. @@ -258,8 +258,8 @@ class _RequestFactory( object ): def __init__(self, baseurl, user_agent, timeout, proxy): ---- mythtv/programs/scripts/hardwareprofile/smolt.py (original) -+++ mythtv/programs/scripts/hardwareprofile/smolt.py (refactored) +--- a/mythtv/programs/scripts/hardwareprofile/smolt.py (original) ++++ b/mythtv/programs/scripts/hardwareprofile/smolt.py (refactored) @@ -42,8 +42,8 @@ import os from urlparse import urljoin @@ -289,8 +289,8 @@ params = { 'uuid':self.host.UUID, 'host':serialized_host_obj_machine, 'token':tok, ---- mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/request.py (original) -+++ mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/request.py (refactored) +--- a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/request.py (original) ++++ b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/request.py (refactored) @@ -21,15 +21,15 @@ # providing the base url, user agent, and proxy information. # The object returned is slightly modified, with a shortcut to urlopen. @@ -311,8 +311,8 @@ class _RequestFactory( object ): def __init__(self, baseurl, user_agent, timeout, proxy): ---- mythtv/programs/scripts/hardwareprofile/MultipartPostHandler.py (original) -+++ mythtv/programs/scripts/hardwareprofile/MultipartPostHandler.py (refactored) +--- a/mythtv/programs/scripts/hardwareprofile/MultipartPostHandler.py (original) ++++ b/mythtv/programs/scripts/hardwareprofile/MultipartPostHandler.py (refactored) @@ -41,8 +41,8 @@ then uploads it to the W3C validator. """ @@ -353,8 +353,8 @@ def validateFile(url): temp = tempfile.mkstemp(suffix=".html") ---- mythtv/programs/scripts/metadata/Music/lyrics/lyricswiki.py (original) -+++ mythtv/programs/scripts/metadata/Music/lyrics/lyricswiki.py (refactored) +--- a/mythtv/programs/scripts/metadata/Music/lyrics/lyricswiki.py (original) ++++ b/mythtv/programs/scripts/metadata/Music/lyrics/lyricswiki.py (refactored) @@ -1,5 +1,5 @@ #-*- coding: UTF-8 -*- -import sys, re, urllib2, socket, HTMLParser @@ -383,8 +383,8 @@ if error.code == 404: response = error.read() else: ---- mythtv/programs/scripts/metadata/Music/lyrics/genius.py (original) -+++ mythtv/programs/scripts/metadata/Music/lyrics/genius.py (refactored) +--- a/mythtv/programs/scripts/metadata/Music/lyrics/genius.py (original) ++++ b/mythtv/programs/scripts/metadata/Music/lyrics/genius.py (refactored) @@ -5,8 +5,8 @@ taxigps """ @@ -420,8 +420,8 @@ response = req.read() except: return False ---- mythtv/programs/scripts/metadata/Music/lyrics/darklyrics.py (original) -+++ mythtv/programs/scripts/metadata/Music/lyrics/darklyrics.py (refactored) +--- a/mythtv/programs/scripts/metadata/Music/lyrics/darklyrics.py (original) ++++ b/mythtv/programs/scripts/metadata/Music/lyrics/darklyrics.py (refactored) @@ -6,7 +6,7 @@ """ @@ -462,8 +462,8 @@ res = request.read(); except: return ""; ---- mythtv/programs/scripts/metadata/Music/lyrics/lyricscom.py (original) -+++ mythtv/programs/scripts/metadata/Music/lyrics/lyricscom.py (refactored) +--- a/mythtv/programs/scripts/metadata/Music/lyrics/lyricscom.py (original) ++++ b/mythtv/programs/scripts/metadata/Music/lyrics/lyricscom.py (refactored) @@ -7,8 +7,8 @@ import sys @@ -502,8 +502,8 @@ resp2 = req2.read() except: return False ---- mythtv/programs/scripts/metadata/Music/lyrics/alsong.py (original) -+++ mythtv/programs/scripts/metadata/Music/lyrics/alsong.py (refactored) +--- a/mythtv/programs/scripts/metadata/Music/lyrics/alsong.py (original) ++++ b/mythtv/programs/scripts/metadata/Music/lyrics/alsong.py (refactored) @@ -6,7 +6,7 @@ import sys @@ -524,8 +524,8 @@ Page = response.read() except: return False ---- mythtv/programs/scripts/metadata/Music/musicbrainzngs/compat.py (original) -+++ mythtv/programs/scripts/metadata/Music/musicbrainzngs/compat.py (refactored) +--- a/mythtv/programs/scripts/metadata/Music/musicbrainzngs/compat.py (original) ++++ b/mythtv/programs/scripts/metadata/Music/musicbrainzngs/compat.py (refactored) @@ -39,12 +39,11 @@ if is_py2: @@ -542,8 +542,8 @@ bytes = str unicode = unicode ---- mythtv/bindings/python/tmdb3/tmdb3/request.py (original) -+++ mythtv/bindings/python/tmdb3/tmdb3/request.py (refactored) +--- a/mythtv/bindings/python/tmdb3/tmdb3/request.py (original) ++++ b/mythtv/bindings/python/tmdb3/tmdb3/request.py (refactored) @@ -14,10 +14,10 @@ # supports python2 and python3 @@ -559,8 +559,8 @@ except (NameError, ImportError): from urllib.parse import urlencode ---- mythtv/bindings/python/MythTV/connections.py (original) -+++ mythtv/bindings/python/MythTV/connections.py (refactored) +--- a/mythtv/bindings/python/MythTV/connections.py (original) ++++ b/mythtv/bindings/python/MythTV/connections.py (refactored) @@ -17,7 +17,7 @@ import lxml.etree as etree import weakref diff --git a/mythtv.spec b/mythtv.spec index 8c28d18..0a92bcf 100644 --- a/mythtv.spec +++ b/mythtv.spec @@ -88,6 +88,7 @@ Patch1: %{name}-space_in_GB.patch Patch2: %{name}-php72_fix.patch Patch3: mythtv-python3.patch Patch4: mythtv-py3_configure.patch +Patch5: mythtv-py3_urllib.patch ################################################################################