Bug#956001: debdiff available
Package: cinnamon-common
Version: 4.4.8-3
Followup-For: Bug #956001
Dear Maintainer,
In regards to minor bug #956001 in cinnamon-common: Python SyntaxWarning in
package setup - bad identity comparisons against literals in cinnamon 4.4.8-3
(testing, unstable)
I have a patch/debdiff ready for you.
-- System Information:
Debian Release: bullseye/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 5.5.0-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages cinnamon-common depends on:
ii dconf-gsettings-backend [gsettings-backend] 0.36.0-1
ii gettext 0.19.8.1-10
ii gir1.2-cinnamondesktop-3.0 4.4.1-3
ii gir1.2-meta-muffin-0.0 4.4.3-1
ii libglib2.0-bin 2.64.1-1
ii python3 3.8.2-3
ii python3-xapp 1.8.1-2
ii xdg-utils 1.1.3-2
cinnamon-common recommends no packages.
cinnamon-common suggests no packages.
-- no debconf information
Index: cinnamon/files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
===================================================================
--- cinnamon.orig/files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+++ cinnamon/files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
@@ -194,7 +194,7 @@ class LauncherEditor(ItemEditor):
def resync_validity(self, *args):
name_text = self.builder.get_object('name-entry').get_text().strip()
exec_text = self.builder.get_object('exec-entry').get_text().strip()
- name_valid = name_text is not ""
+ name_valid = name_text != ""
exec_valid = self.validate_exec_line(exec_text)
self.sync_widgets(name_valid, exec_valid)
@@ -236,7 +236,7 @@ class DirectoryEditor(ItemEditor):
def resync_validity(self, *args):
name_text = self.builder.get_object('name-entry').get_text().strip()
- valid = (name_text is not "")
+ valid = (name_text != "")
self.builder.get_object('ok').set_sensitive(valid)
def load(self):
@@ -281,7 +281,7 @@ class CinnamonLauncherEditor(ItemEditor)
def resync_validity(self, *args):
name_text = self.builder.get_object('name-entry').get_text().strip()
exec_text = self.builder.get_object('exec-entry').get_text().strip()
- name_valid = name_text is not ""
+ name_valid = name_text != ""
exec_valid = self.validate_exec_line(exec_text)
self.sync_widgets(name_valid, exec_valid)
Index: cinnamon/files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py
===================================================================
--- cinnamon.orig/files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py
+++ cinnamon/files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py
@@ -339,13 +339,13 @@ class TimeChooserButton(Gtk.Button):
def __init__(self, follow_current=False, time=None, show_seconds='default'):
super(TimeChooserButton, self).__init__()
- if show_seconds is 'default':
+ if show_seconds == 'default':
self.show_seconds_override_default = False
else:
self.show_seconds_override_default = True
- if show_seconds is 'true':
+ if show_seconds == 'true':
self.show_seconds = True
- elif show_seconds is 'false':
+ elif show_seconds == 'false':
self.show_seconds = False
else:
raise ValueError('Invalid argument: show_seconds must be default, true, or false')
Index: cinnamon/files/usr/share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py
===================================================================
--- cinnamon.orig/files/usr/share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py
+++ cinnamon/files/usr/share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py
@@ -239,7 +239,7 @@ class JSONSettingsRevealer(Gtk.Revealer)
break
if self.key is None:
- if key[:1] is '!':
+ if key[:1] == '!':
self.invert = True
self.key = key[1:]
else:
Index: cinnamon/files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py
===================================================================
--- cinnamon.orig/files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py
+++ cinnamon/files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py
@@ -419,7 +419,7 @@ class Module:
categories, iter = tree.get_selection().get_selected()
if iter:
category = categories[iter][2]
- if category.int_name is not "custom":
+ if category.int_name != "custom":
for keybinding in category.keybindings:
self.kb_store.append((keybinding.label, keybinding))
else:
@@ -428,7 +428,7 @@ class Module:
def loadCustoms(self):
for category in self.main_store:
- if category.int_name is "custom":
+ if category.int_name == "custom":
category.clear()
parent = Gio.Settings.new(CUSTOM_KEYS_PARENT_SCHEMA)
@@ -443,7 +443,7 @@ class Module:
schema.get_strv("binding"))
self.kb_store.append((custom_kb.label, custom_kb))
for category in self.main_store:
- if category.int_name is "custom":
+ if category.int_name == "custom":
category.add(custom_kb)
def onKeyBindingChanged(self, tree):
@@ -453,7 +453,7 @@ class Module:
if iter:
keybinding = keybindings[iter][1]
for entry in keybinding.entries:
- if entry is not "_invalid_":
+ if entry != "_invalid_":
self.entry_store.append((entry,))
self.remove_custom_button.set_property('sensitive', isinstance(keybinding, CustomKeyBinding))
@@ -536,7 +536,7 @@ class Module:
new_schema.set_strv("binding", ())
i = 0
for cat in self.cat_store:
- if cat[2].int_name is "custom":
+ if cat[2].int_name == "custom":
self.cat_tree.set_cursor(str(i), self.cat_tree.get_column(0), False)
i += 1
i = 0
@@ -574,7 +574,7 @@ class Module:
i = 0
for cat in self.cat_store:
- if cat[2].int_name is "custom":
+ if cat[2].int_name == "custom":
self.cat_tree.set_cursor(str(i), self.cat_tree.get_column(0), False)
i += 1
@@ -600,7 +600,7 @@ class Module:
i = 0
for cat in self.cat_store:
- if cat[2].int_name is "custom":
+ if cat[2].int_name == "custom":
self.cat_tree.set_cursor(str(i), self.cat_tree.get_column(0), False)
i += 1
i = 0
@@ -691,7 +691,7 @@ class KeyBinding():
def writeSettings(self):
array = []
for entry in self.entries:
- if entry is not "":
+ if entry != "":
array.append(entry)
self.settings.set_strv(self.key, array)
@@ -731,7 +731,7 @@ class CustomKeyBinding():
array = []
for entry in self.entries:
- if entry is not "":
+ if entry != "":
array.append(entry)
settings.set_strv("binding", array)
@@ -777,6 +777,6 @@ class AddCustomDialog(Gtk.Dialog):
self.command_entry.set_text(path)
def onEntriesChanged(self, widget):
- ok_enabled = self.name_entry.get_text().strip() is not "" and self.command_entry.get_text().strip() is not ""
+ ok_enabled = self.name_entry.get_text().strip() != "" and self.command_entry.get_text().strip() != ""
self.set_response_sensitive(Gtk.ResponseType.OK, ok_enabled)
-
\ No newline at end of file
+
Index: cinnamon/files/usr/share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py
===================================================================
--- cinnamon.orig/files/usr/share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py
+++ cinnamon/files/usr/share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py
@@ -118,7 +118,7 @@ class CinnamonSlideshow(dbus.service.Obj
def on_next_file_complete(obj, res, user_data=all_files):
files = obj.next_files_finish(res)
file_list = all_files
- if len(files) is not 0:
+ if len(files) != 0:
file_list = file_list.extend(files)
enumerator.next_files_async(100, GLib.PRIORITY_LOW, None, on_next_file_complete, None)
else:
Format: 3.0 (quilt)
Source: cinnamon
Binary: cinnamon, cinnamon-common, cinnamon-doc
Architecture: any all
Version: 4.4.8-4.1
Maintainer: Debian Cinnamon Team <debian-cinnamon@lists.debian.org>
Uploaders: Maximiliano Curia <maxy@debian.org>, Margarita Manterola <marga@debian.org>, Fabio Fantoni <fantonifabio@tiscali.it>, Norbert Preining <norbert@preining.info>
Homepage: http://cinnamon.linuxmint.com
Standards-Version: 4.1.4
Vcs-Browser: https://salsa.debian.org/cinnamon-team/cinnamon
Vcs-Git: https://salsa.debian.org/cinnamon-team/cinnamon.git
Build-Depends: autoconf-archive, automake, debhelper (>= 11~), dh-python, dpkg-dev (>= 1.16.1~), gir1.2-meta-muffin-0.0 (>= 4.4), gnome-pkg-tools (>= 0.11), gobject-introspection (>= 1.29.15), gtk-doc-tools, intltool, libcinnamon-desktop-dev (>= 4.4), libcinnamon-menu-3-dev (>= 4.4), libcjs-dev (>= 4.4), libclutter-1.0-dev (>= 1.10.0), libcroco3-dev (>= 0.6.2), libdbus-1-dev, libgirepository1.0-dev (>= 1.29.15), libgl1-mesa-dev, libglib2.0-dev (>= 2.25.11), libgstreamer1.0-dev, libgtk-3-dev (>= 3.9.12), libjson-glib-dev (>= 0.13.2), libmuffin-dev (>= 4.4), libnm-dev (>= 1.6) [linux-any], libnma-dev [linux-any], libpolkit-agent-1-dev (>= 0.100), libpulse-dev, libsoup2.4-dev, libstartup-notification0-dev (>= 0.11), libxfixes-dev (>= 1:5.0), python3:any
Package-List:
cinnamon deb x11 optional arch=any
cinnamon-common deb x11 optional arch=all
cinnamon-doc deb doc optional arch=all
Checksums-Sha1:
529081490fdb39b9b8f38db71232933b0deff265 31431456 cinnamon_4.4.8.orig.tar.xz
c20807a4a9d9e4e892fbbf491269fb740912f745 100112 cinnamon_4.4.8-4.1.debian.tar.xz
Checksums-Sha256:
5f9d753b4858533915de09b631f50d0756821d7bf0412e48a73f501e631dcc91 31431456 cinnamon_4.4.8.orig.tar.xz
4f83aaf93c8c8788acc57f4584a052c383730be3ae81eaf2b0e44c65775e6cca 100112 cinnamon_4.4.8-4.1.debian.tar.xz
Files:
1ab4a9cb4f989335744402afa10c3b64 31431456 cinnamon_4.4.8.orig.tar.xz
1f646aa59326adb5bdc7d79a157dca53 100112 cinnamon_4.4.8-4.1.debian.tar.xz
Reply to: