Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package osdlyrics for openSUSE:Factory checked in at 2024-01-03 12:27:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osdlyrics (Old) and /work/SRC/openSUSE:Factory/.osdlyrics.new.28375 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osdlyrics" Wed Jan 3 12:27:13 2024 rev:12 rq:1135876 version:0.5.15 Changes: -------- --- /work/SRC/openSUSE:Factory/osdlyrics/osdlyrics.changes 2023-07-18 22:08:41.687180333 +0200 +++ /work/SRC/openSUSE:Factory/.osdlyrics.new.28375/osdlyrics.changes 2024-01-03 12:27:15.364447998 +0100 @@ -1,0 +2,7 @@ +Sun Dec 31 12:42:52 UTC 2023 - Hillwood Yang <hillw...@opensuse.org> + +- Update version to 0.5.15 + * Remove 99% of Python2 support + * Remove dependency on future + +------------------------------------------------------------------- Old: ---- osdlyrics-0.5.14.tar.gz New: ---- osdlyrics-0.5.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osdlyrics.spec ++++++ --- /var/tmp/diff_new_pack.7eP8Ty/_old 2024-01-03 12:27:16.000471224 +0100 +++ /var/tmp/diff_new_pack.7eP8Ty/_new 2024-01-03 12:27:16.004471370 +0100 @@ -17,7 +17,7 @@ Name: osdlyrics -Version: 0.5.14 +Version: 0.5.15 Release: 0 Summary: A third-party lyrics display program License: GPL-3.0-or-later @@ -26,8 +26,6 @@ Source0: https://github.com/osdlyrics/osdlyrics/archive/%{version}/%{name}-%{version}.tar.gz Source1: %{name}.appdata.xml BuildRequires: fdupes -BuildRequires: gcc -BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: glibc-devel BuildRequires: gnome-common ++++++ osdlyrics-0.5.14.tar.gz -> osdlyrics-0.5.15.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/.github/workflows/ci.yml new/osdlyrics-0.5.15/.github/workflows/ci.yml --- old/osdlyrics-0.5.14/.github/workflows/ci.yml 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/.github/workflows/ci.yml 2023-12-20 15:02:07.000000000 +0100 @@ -18,7 +18,7 @@ run: sudo apt-get update && sudo apt-get upgrade - name: Install dependencies - run: sudo apt-get install dh-python intltool lib{dbus-glib-1,gtk2.0,notify,x11}-dev python3{,-dbus,-future,-gi} + run: sudo apt-get install dh-python intltool lib{dbus-glib-1,gtk2.0,notify,x11}-dev python3{,-dbus,-gi} - name: Version run: ./check-version.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/README.md new/osdlyrics-0.5.15/README.md --- old/osdlyrics-0.5.14/README.md 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/README.md 2023-12-20 15:02:07.000000000 +0100 @@ -51,6 +51,8 @@ You can read more at [Building wiki page](https://github.com/osdlyrics/osdlyrics/wiki/Building). +Since version `0.5.15` Python 2 is no longer supported. Please upgrade to Python 3.12+. + ## Troubleshooting Check [Troubleshooting wiki page](https://github.com/osdlyrics/osdlyrics/wiki/Troubleshooting) for more detailed help. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/autogen.sh new/osdlyrics-0.5.15/autogen.sh --- old/osdlyrics-0.5.14/autogen.sh 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/autogen.sh 2023-12-20 15:02:07.000000000 +0100 @@ -6,8 +6,5 @@ args=$@ -if [ -e /usr/bin/python2 ]; then - args="$args PYTHON=/usr/bin/python2" -fi AUTOPOINT='intltoolize' autoreconf --install --force $DIR $DIR/configure $args diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/check-version.sh new/osdlyrics-0.5.15/check-version.sh --- old/osdlyrics-0.5.14/check-version.sh 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/check-version.sh 2023-12-20 15:02:07.000000000 +0100 @@ -1,7 +1,7 @@ #h!/usr/bin/env sh GIT="${GIT:-git}" -OL_VERSION="${OL_VERSION:-0.5.13}" +OL_VERSION="${OL_VERSION:-0.5.15}" if [ ! "$("$GIT" rev-parse --show-prefix 2>/dev/null)" ]; then _GIT_VERSION="$("$GIT" describe --always --tags 2>/dev/null)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/daemon/ini_config.py new/osdlyrics-0.5.15/daemon/ini_config.py --- old/osdlyrics-0.5.14/daemon/ini_config.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/daemon/ini_config.py 2023-12-20 15:02:07.000000000 +0100 @@ -18,10 +18,6 @@ # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from future import standard_library -standard_library.install_aliases() -from builtins import str, super - import configparser import dbus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/daemon/lrcdb.py new/osdlyrics-0.5.15/daemon/lrcdb.py --- old/osdlyrics-0.5.14/daemon/lrcdb.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/daemon/lrcdb.py 2023-12-20 15:02:07.000000000 +0100 @@ -17,11 +17,6 @@ # You should have received a copy of the GNU General Public License # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from builtins import object - import logging import os.path import sqlite3 @@ -48,7 +43,7 @@ return param -class LrcDb(object): +class LrcDb: """ Database to store location of LRC files that have been manually assigned """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/daemon/lyrics.py new/osdlyrics-0.5.15/daemon/lyrics.py --- old/osdlyrics-0.5.14/daemon/lyrics.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/daemon/lyrics.py 2023-12-20 15:02:07.000000000 +0100 @@ -18,10 +18,6 @@ # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from builtins import super -from future import standard_library -standard_library.install_aliases() - import logging import os import os.path diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/daemon/lyricsource.py new/osdlyrics-0.5.15/daemon/lyricsource.py --- old/osdlyrics-0.5.14/daemon/lyricsource.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/daemon/lyricsource.py 2023-12-20 15:02:07.000000000 +0100 @@ -18,8 +18,6 @@ # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from builtins import str, super - import logging import dbus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/daemon/main.py new/osdlyrics-0.5.15/daemon/main.py --- old/osdlyrics-0.5.14/daemon/main.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/daemon/main.py 2023-12-20 15:02:07.000000000 +0100 @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from __future__ import print_function -from builtins import super - import logging import dbus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/daemon/player.py new/osdlyrics-0.5.15/daemon/player.py --- old/osdlyrics-0.5.14/daemon/player.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/daemon/player.py 2023-12-20 15:02:07.000000000 +0100 @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from builtins import str, super - import logging from dbus.exceptions import DBusException diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/lyricsources/megalobiz/megalobiz.py new/osdlyrics-0.5.15/lyricsources/megalobiz/megalobiz.py --- old/osdlyrics-0.5.14/lyricsources/megalobiz/megalobiz.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/lyricsources/megalobiz/megalobiz.py 2023-12-20 15:02:07.000000000 +0100 @@ -18,9 +18,6 @@ # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from future import standard_library -standard_library.install_aliases() -from builtins import str, super from urllib.parse import unquote import urllib.parse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/lyricsources/netease/netease.py new/osdlyrics-0.5.15/lyricsources/netease/netease.py --- old/osdlyrics-0.5.14/lyricsources/netease/netease.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/lyricsources/netease/netease.py 2023-12-20 15:02:07.000000000 +0100 @@ -1,8 +1,3 @@ -from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from builtins import map, str, super - import gettext import http.client import json diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/lyricsources/netease_tr/netease_tr.py new/osdlyrics-0.5.15/lyricsources/netease_tr/netease_tr.py --- old/osdlyrics-0.5.14/lyricsources/netease_tr/netease_tr.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/lyricsources/netease_tr/netease_tr.py 2023-12-20 15:02:07.000000000 +0100 @@ -1,8 +1,3 @@ -from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from builtins import map, str, super - import gettext import http.client import json diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/lyricsources/subtitles4songs/subtitles4songs.py new/osdlyrics-0.5.15/lyricsources/subtitles4songs/subtitles4songs.py --- old/osdlyrics-0.5.14/lyricsources/subtitles4songs/subtitles4songs.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/lyricsources/subtitles4songs/subtitles4songs.py 2023-12-20 15:02:07.000000000 +0100 @@ -18,9 +18,6 @@ # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from future import standard_library -standard_library.install_aliases() -from builtins import str, super from urllib.parse import unquote # import urlparse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/lyricsources/xiami/xiami.py new/osdlyrics-0.5.15/lyricsources/xiami/xiami.py --- old/osdlyrics-0.5.14/lyricsources/xiami/xiami.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/lyricsources/xiami/xiami.py 2023-12-20 15:02:07.000000000 +0100 @@ -18,10 +18,6 @@ # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from future import standard_library -standard_library.install_aliases() -from builtins import str, super - # import urlparse import gettext import html.parser diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/players/http/error.py new/osdlyrics-0.5.15/players/http/error.py --- old/osdlyrics-0.5.14/players/http/error.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/players/http/error.py 2023-12-20 15:02:07.000000000 +0100 @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from future import standard_library -standard_library.install_aliases() - import http.client diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/players/http/http-player.py new/osdlyrics-0.5.15/players/http/http-player.py --- old/osdlyrics-0.5.14/players/http/http-player.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/players/http/http-player.py 2023-12-20 15:02:07.000000000 +0100 @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from builtins import super - import datetime import logging import time diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/players/http/server.py new/osdlyrics-0.5.15/players/http/server.py --- old/osdlyrics-0.5.14/players/http/server.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/players/http/server.py 2023-12-20 15:02:07.000000000 +0100 @@ -18,9 +18,6 @@ # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from future import standard_library -standard_library.install_aliases() - import http.server import json import logging diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/players/http/validator.py new/osdlyrics-0.5.15/players/http/validator.py --- old/osdlyrics-0.5.14/players/http/validator.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/players/http/validator.py 2023-12-20 15:02:07.000000000 +0100 @@ -18,8 +18,6 @@ # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from builtins import object - from error import BadRequestError __all__ = ( @@ -32,7 +30,7 @@ ) -class baseparam(object): +class baseparam: def __init__(self, optional=False): self.optional = optional diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/players/mpd/mpd_proxy.py new/osdlyrics-0.5.15/players/mpd/mpd_proxy.py --- old/osdlyrics-0.5.14/players/mpd/mpd_proxy.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/players/mpd/mpd_proxy.py 2023-12-20 15:02:07.000000000 +0100 @@ -20,9 +20,6 @@ """MPD support for OSD Lyrics. Requires MPD >= 0.16 and mpd-python >= 0.3 """ -from __future__ import unicode_literals -from builtins import object, super - import logging import os import select @@ -54,7 +51,7 @@ pass -class CommandCallback(object): +class CommandCallback: def __init__(self, command, callback): self.command = command self.callback = callback @@ -64,7 +61,7 @@ self.callback(*args) -class Cmds(object): +class Cmds: CONFIG = 'config' CURRENTSONG = 'currentsong' IDLE = 'idle' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/players/mpris1/mpris1.py new/osdlyrics-0.5.15/players/mpris1/mpris1.py --- old/osdlyrics-0.5.14/players/mpris1/mpris1.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/players/mpris1/mpris1.py 2023-12-20 15:02:07.000000000 +0100 @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from builtins import str, super - from contextlib import contextmanager import logging diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/players/mpris2/mpris2.py new/osdlyrics-0.5.15/players/mpris2/mpris2.py --- old/osdlyrics-0.5.14/players/mpris2/mpris2.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/players/mpris2/mpris2.py 2023-12-20 15:02:07.000000000 +0100 @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from builtins import str, super - import logging import dbus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/python/app.py new/osdlyrics-0.5.15/python/app.py --- old/osdlyrics-0.5.14/python/app.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/python/app.py 2023-12-20 15:02:07.000000000 +0100 @@ -18,8 +18,6 @@ # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from builtins import object - from optparse import OptionParser import dbus @@ -42,7 +40,7 @@ pass -class App(object): +class App: """ Basic class to create a component application for OSD Lyrics. The application creates a mainloop, owns a DBus name, and exits when the bus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/python/config.py new/osdlyrics-0.5.15/python/config.py --- old/osdlyrics-0.5.14/python/config.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/python/config.py 2023-12-20 15:02:07.000000000 +0100 @@ -18,8 +18,6 @@ # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from builtins import object - import logging import dbus @@ -29,7 +27,7 @@ CONFIG_INTERFACE = 'org.osdlyrics.Config' -class Config(object): +class Config: """ Helper class to retrive configs from OSD Lyrics through DBus It provides a set of get_<type> functions to get config values with default diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/python/dbusext/property.py new/osdlyrics-0.5.15/python/dbusext/property.py --- old/osdlyrics-0.5.14/python/dbusext/property.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/python/dbusext/property.py 2023-12-20 15:02:07.000000000 +0100 @@ -18,8 +18,6 @@ # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from builtins import object, str - import dbus.exceptions @@ -28,7 +26,7 @@ dbus.exceptions.DBusException.__init__(self, dbus_error_name='org.osdlyrics.Error.AccessDenied', *args) -class Property(object): +class Property: """ DBus property class """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/python/dbusext/service.py new/osdlyrics-0.5.15/python/dbusext/service.py --- old/osdlyrics-0.5.14/python/dbusext/service.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/python/dbusext/service.py 2023-12-20 15:02:07.000000000 +0100 @@ -30,10 +30,7 @@ from .property import Property -# Use the default encoding in ElementTree.tostring under Python 2, but prefer -# Unicode under Python 3 to obtain a 'str', not 'bytes' instance. -# TODO: remove once we have fully migrated to Python 3 -INTROSPECT_ENCODING = 'unicode' if sys.version_info >= (3, 0) else 'us-ascii' +INTROSPECT_ENCODING = 'unicode' class ObjectTypeCls(dbus.service.InterfaceType, ABCMeta): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/python/errors.py new/osdlyrics-0.5.15/python/errors.py --- old/osdlyrics-0.5.14/python/errors.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/python/errors.py 2023-12-20 15:02:07.000000000 +0100 @@ -17,7 +17,6 @@ # You should have received a copy of the GNU General Public License # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from builtins import super import dbus.exceptions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/python/lrc.py new/osdlyrics-0.5.15/python/lrc.py --- old/osdlyrics-0.5.14/python/lrc.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/python/lrc.py 2023-12-20 15:02:07.000000000 +0100 @@ -18,9 +18,6 @@ # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from __future__ import print_function -from builtins import object - import re import dbus.types @@ -39,7 +36,7 @@ ATTR_PATTERN = re.compile(r'^\[([\w\d]+):(.*)\]$') -class AttrToken(object): +class AttrToken: """ Represents tags with the form of ``[key:value]`` """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/python/lyricsource.py new/osdlyrics-0.5.15/python/lyricsource.py --- old/osdlyrics-0.5.14/python/lyricsource.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/python/lyricsource.py 2023-12-20 15:02:07.000000000 +0100 @@ -18,10 +18,6 @@ # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from future import standard_library -standard_library.install_aliases() -from builtins import chr, object, range, str, super - import logging import threading @@ -52,7 +48,7 @@ return decfunc -class SearchResult(object): +class SearchResult: """ Lyrics that match the metadata to be searched. """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/python/metadata.py new/osdlyrics-0.5.15/python/metadata.py --- old/osdlyrics-0.5.14/python/metadata.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/python/metadata.py 2023-12-20 15:02:07.000000000 +0100 @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from __future__ import unicode_literals -from builtins import object - import logging import re @@ -28,7 +25,7 @@ from .consts import METADATA_ALBUM, METADATA_ARTIST, METADATA_TITLE -class Metadata(object): +class Metadata: """ Metadata of a track diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/python/pattern.py new/osdlyrics-0.5.15/python/pattern.py --- old/osdlyrics-0.5.14/python/pattern.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/python/pattern.py 2023-12-20 15:02:07.000000000 +0100 @@ -17,11 +17,6 @@ # You should have received a copy of the GNU General Public License # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from builtins import str - import os.path import urllib.parse import urllib.request diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/python/player_proxy.py new/osdlyrics-0.5.15/python/player_proxy.py --- old/osdlyrics-0.5.14/python/player_proxy.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/python/player_proxy.py 2023-12-20 15:02:07.000000000 +0100 @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from __future__ import unicode_literals -from builtins import object, super -from future.utils import raise_from from abc import abstractmethod import logging @@ -34,7 +31,7 @@ from .dbusext.service import Object as DBusObject, property as dbus_property -class CAPS(object): +class CAPS: NEXT = 1 << 0 PREV = 1 << 1 PAUSE = 1 << 2 @@ -43,13 +40,13 @@ PROVIDE_METADATA = 1 << 5 -class REPEAT(object): +class REPEAT: NONE = 0 TRACK = 1 ALL = 2 -class STATUS(object): +class STATUS: PLAYING = 0 PAUSED = 1 STOPPED = 2 @@ -114,9 +111,9 @@ try: player = self.do_connect_player(player_name) except TypeError as e: - raise_from(errors.BaseError( + raise errors.BaseError( '%s cannot instantiate Player[%s, %s]' % (type(self).__name__, self.name, player_name) - ), e) + ) from e if player and player.connected: player.set_disconnect_cb(self._player_lost_cb) self._connected_players[player_name] = player @@ -172,7 +169,7 @@ raise NotImplementedError() -class PlayerInfo(object): +class PlayerInfo: """Information about a supported player """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/python/timer.py new/osdlyrics-0.5.15/python/timer.py --- old/osdlyrics-0.5.14/python/timer.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/python/timer.py 2023-12-20 15:02:07.000000000 +0100 @@ -17,12 +17,10 @@ # You should have received a copy of the GNU General Public License # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from builtins import object - from datetime import datetime -class Timer(object): +class Timer: """ A timer to account the elapsed playing. """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/python/utils.py new/osdlyrics-0.5.15/python/utils.py --- old/osdlyrics-0.5.14/python/utils.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/python/utils.py 2023-12-20 15:02:07.000000000 +0100 @@ -17,11 +17,6 @@ # You should have received a copy of the GNU General Public License # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from builtins import object, str - import io import os import os.path @@ -42,14 +37,8 @@ pycurl.global_init(pycurl.GLOBAL_DEFAULT) -if sys.version_info < (3, 0): - # make sure the default encoding is utf-8 - if sys.getdefaultencoding() != 'utf-8': - reload(sys) - sys.setdefaultencoding('utf-8') - -class ProxySettings(object): +class ProxySettings: """ """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.14/tools/create-lyricsource.py new/osdlyrics-0.5.15/tools/create-lyricsource.py --- old/osdlyrics-0.5.14/tools/create-lyricsource.py 2023-06-06 22:30:50.000000000 +0200 +++ new/osdlyrics-0.5.15/tools/create-lyricsource.py 2023-12-20 15:02:07.000000000 +0100 @@ -18,9 +18,6 @@ # along with OSD Lyrics. If not, see <https://www.gnu.org/licenses/>. # -from __future__ import print_function -from builtins import input - import os import os.path import re @@ -56,10 +53,6 @@ """ PYTHON = r"""# -*- coding: utf-8 -*- -from __future__ import unicode_literals -from builtins import super -from future import standard_library -standard_library.install_aliases() import http.client ++++++ osdlyrics.appdata.xml ++++++ --- /var/tmp/diff_new_pack.7eP8Ty/_old 2024-01-03 12:27:16.156476921 +0100 +++ /var/tmp/diff_new_pack.7eP8Ty/_new 2024-01-03 12:27:16.156476921 +0100 @@ -35,12 +35,11 @@ <url type="homepage">https://github.com/osdlyrics/osdlyrics</url> <url type="bugtracker">https://github.com/osdlyrics/osdlyrics/issues</url> <releases> - <release version="0.5.14" date="2023-06-07"> + <release version="0.5.15" date="2023-12-17"> <description> <p> - fix Chinese encodings - fix proxy-password config - fix sources in the default search + Remove 99% of Python2 support + Remove dependency on future </p> </description> </release>
