Closes #8956 - cinnamon-settings.py and ExtensionCore.py: now compatibles with Python 3.8 #8959
Conversation
(Python 3.8 is used on Arch.) Also replaces `self.window.set_wmclass(wm_class, wm_class)` by `self.window.set_role(wm_class)` to avoid the warning message "Gtk.Window.set_wmclass is deprecated".
claudiux
changed the title
claudiux
changed the title
|
Issues
======
+ Solved 1
See the complete overview on Codacy |
files/usr/share/cinnamon/cinnamon-settings/bin/ExtensionCore.py
Outdated
Show resolved
Hide resolved
| @@ -27,7 +27,7 @@ | |||
| import SettingsWidgets | |||
|
|
|||
| # i18n | |||
| gettext.install("cinnamon", "/usr/share/locale", names="ngettext") | |||
| gettext.install("cinnamon", "/usr/share/locale", names="gettext.ngettext") | |||
There was a problem hiding this comment.
Both "ngettext" and "gettext.ngettext" are incorrect, they are the set sequence {'t', 'x', 'e', 'n', 'g', '.'} and have no syntactic meaning here. Additionally, your later on ngettext is changed to be accessed via gettext.ngettext, so it doesn't need the install() function to install a global namespace object.
| @@ -422,7 +422,7 @@ def __init__(self): | |||
| # can consider it as a standalone app and give it its own | |||
| # group. | |||
| wm_class = "cinnamon-settings %s" % arg1 | |||
| self.window.set_wmclass(wm_class, wm_class) | |||
| self.window.set_role(wm_class) | |||
There was a problem hiding this comment.
Removing a deprecation sounds useful, but why does this come with a commit message claiming it is relevant to python 3.8?
| @@ -910,7 +910,7 @@ def build_list(self, *args): | |||
| updates_available = self.spices.get_n_updates() | |||
| self.update_all_button.set_sensitive(updates_available) | |||
| if updates_available > 0: | |||
| msg_text = _("Update all") + ' (' + ngettext("%d update available", "%d updates available", updates_available) % updates_available + ')' | |||
| msg_text = _("Update all") + ' (' + gettext.ngettext("%d update available", "%d updates available", updates_available) % updates_available + ')' | |||
There was a problem hiding this comment.
I'd intuitively expect any future users of the API to want to use ngettext() directly, but maybe that is just me.
|
I'll close this for now but we should chase it and fix it all the same. The reason I close it is because neither fixes work here but more importantly they shouldn't be part of the same PR. Window role: I don't mind something more modern than As it is, when you launch Ngettext What's going on with Python 3.8 and ngettext? Where is the regression coming from? Testing here with python 3.6 in French, on master I get "9 mises a jour disponibles".. if I switch from |
|
@clefebvre I rationalized this in #8964 |
(Python 3.8 is used on Arch with Cinnamon 4.2.4.)
Also replaces
self.window.set_wmclass(wm_class, wm_class)byself.window.set_role(wm_class)to avoid the warning message "Gtk.Window.set_wmclass is deprecated" (https://developer.gnome.org/gtk3/stable/GtkWindow.html#gtk-window-set-wmclass).Closes #8956.