diff --git a/.github/workflows/buildmaster.yml b/.github/workflows/buildmaster.yml index 6894984bbc9..10af0e1d930 100644 --- a/.github/workflows/buildmaster.yml +++ b/.github/workflows/buildmaster.yml @@ -48,7 +48,7 @@ jobs: sudo apt install ccache qt5-qmake qtscript5-dev nasm libsystemd-dev libfreetype6-dev libmp3lame-dev libx264-dev libx265-dev libxrandr-dev libxml2-dev sudo apt install libavahi-compat-libdnssd-dev libasound2-dev liblzo2-dev libhdhomerun-dev libsamplerate0-dev libva-dev libdrm-dev libvdpau-dev sudo apt install libass-dev libpulse-dev libcec-dev libssl-dev libtag1-dev libbluray-dev libbluray-bdj libgnutls28-dev libqt5webkit5-dev - sudo apt install libvpx-dev python3-mysqldb python3-lxml python3-simplejson python3-future python3-setuptools libdbi-perl libdbd-mysql-perl libnet-upnp-perl + sudo apt install libvpx-dev python3-mysqldb python3-lxml python3-future python3-setuptools libdbi-perl libdbd-mysql-perl libnet-upnp-perl sudo apt install libio-socket-inet6-perl libxml-simple-perl libqt5sql5-mysql libwayland-dev qtbase5-private-dev libzip-dev libsoundtouch-dev if: runner.os == 'Linux' diff --git a/mythtv/configure b/mythtv/configure index 7fb9ff640e2..7db121f3973 100755 --- a/mythtv/configure +++ b/mythtv/configure @@ -5535,7 +5535,7 @@ if enabled bdjava; then java_code_version=1.4 javac_version=`"${JAVAC}" -version 2>&1 | head -n 1` - + echo "${javac_version}" | grep -E -q '^javac (9|1[0-1])' && java_code_version=1.6 echo "${javac_version}" | grep -E -q '^javac (1[2-9])' && java_code_version=1.7 echo "${javac_version}" | grep -E -q '^javac (2.*)' && java_code_version=1.7 @@ -6563,7 +6563,6 @@ if enabled bindings_python; then check_py_lib MySQLdb || disable_bindings_python "MySQLdb" check_py_lib lxml || disable_bindings_python "lxml" check_py_lib requests || disable_bindings_python "requests" - check_py_lib simplejson || disable_bindings_python "simplejson" check_py_lib future || disable_bindings_python "future" check_python "(3,11,1)" && check_py_lib wheel && check_py_lib_version pip "(23,0,1)" && USE_PYTHON_PIP="yes" fi diff --git a/mythtv/programs/scripts/hardwareprofile/smolt.py b/mythtv/programs/scripts/hardwareprofile/smolt.py index 1bcc8060d07..464f068d6fc 100644 --- a/mythtv/programs/scripts/hardwareprofile/smolt.py +++ b/mythtv/programs/scripts/hardwareprofile/smolt.py @@ -50,7 +50,6 @@ from urlparse import urlparse import json from json import JSONEncoder -from simplejson import errors as sje import datetime import logging @@ -790,8 +789,8 @@ def serialize(object, human=False): sys.exit(1) try: - admin_obj = admin_token.json() - except sje.JSONDecodeError: + admin_obj = json.loads(admin_token.content) + except json.JSONDecodeError: self.session.close() error(_('Incorrect server response. Expected a JSON string')) return (1, None, None)