mkdir -p "${COV_DIR}"
export COVERAGE_FILE="${COV_DIR}/.coverage.${COV_KEY}"
+# FIXME: g_callable_info_free_closure etc
+CFLAGS+=" -Wno-error=deprecated-declarations"
+
# https://docs.python.org/3/using/cmdline.html#envvar-PYTHONDEVMODE
export PYTHONDEVMODE=1
+3.42.1 - 2022-04-17
+-------------------
+
+* Do not error out for unknown scopes :mr:`179`
+* gtk overrides: restore Gtk.ListStore.insert_with_valuesv with newer gtk4 :issue:`467`
+* gtk overrides: Do not override Treeview.enable_model_drag_xx for GTK4 :mr:`175`
+* Implement DynamicImporter.find_spec() to silence a deprecation warning with Python 3.10 :issue:`473`
+* Some test/CI fixes
+
+
3.42.0 - 2021-09-19
-------------------
def __init__(self, path):
self.path = path
- def find_module(self, fullname, path=None):
+ def _find_module_check(self, fullname):
if not fullname.startswith(self.path):
- return
+ return False
path, namespace = fullname.rsplit('.', 1)
- if path != self.path:
- return
+ return path == self.path
+
+ def find_spec(self, fullname, path=None, target=None):
+ if self._find_module_check(fullname):
+ return importlib.util.spec_from_loader(fullname, self)
- return self
+ def find_module(self, fullname, path=None):
+ if self._find_module_check(fullname):
+ return self
def load_module(self, fullname):
if fullname in sys.modules:
__all__.append('PyGTKDeprecationWarning')
-def _construct_target_list(targets):
- """Create a list of TargetEntry items from a list of tuples in the form (target, flags, info)
-
- The list can also contain existing TargetEntry items in which case the existing entry
- is re-used in the return list.
- """
- target_entries = []
- for entry in targets:
- if not isinstance(entry, Gtk.TargetEntry):
- entry = Gtk.TargetEntry.new(*entry)
- target_entries.append(entry)
- return target_entries
+if GTK2 or GTK3:
+ def _construct_target_list(targets):
+ """Create a list of TargetEntry items from a list of tuples in the form (target, flags, info)
+ The list can also contain existing TargetEntry items in which case the existing entry
+ is re-used in the return list.
+ """
+ target_entries = []
+ for entry in targets:
+ if not isinstance(entry, Gtk.TargetEntry):
+ entry = Gtk.TargetEntry.new(*entry)
+ target_entries.append(entry)
+ return target_entries
-__all__.append('_construct_target_list')
+ __all__.append('_construct_target_list')
def _builder_connect_callback(builder, gobj, signal_name, handler_name, connect_obj, flags, obj_or_map):
Gtk.ListStore.__init__(self)
self.set_column_types(column_types)
+ # insert_with_valuesv got renamed to insert_with_values with 4.1.0
+ # https://gitlab.gnome.org/GNOME/gtk/-/commit/a1216599ff6b39bca3e9
+ if not hasattr(Gtk.ListStore, "insert_with_valuesv"):
+ insert_with_valuesv = Gtk.ListStore.insert_with_values
+ elif not hasattr(Gtk.ListStore, "insert_with_values"):
+ insert_with_values = Gtk.ListStore.insert_with_valuesv
+
def _do_insert(self, position, row):
if row is not None:
row, columns = self._convert_row(row)
- treeiter = self.insert_with_valuesv(position, columns, row)
+ treeiter = self.insert_with_values(position, columns, row)
else:
treeiter = Gtk.ListStore.insert(self, position)
get_visible_range = strip_boolean_result(Gtk.TreeView.get_visible_range)
get_dest_row_at_pos = strip_boolean_result(Gtk.TreeView.get_dest_row_at_pos)
- def enable_model_drag_source(self, start_button_mask, targets, actions):
- target_entries = _construct_target_list(targets)
- super(TreeView, self).enable_model_drag_source(start_button_mask,
- target_entries,
- actions)
+ if GTK2 or GTK3:
+ def enable_model_drag_source(self, start_button_mask, targets, actions):
+ target_entries = _construct_target_list(targets)
+ super(TreeView, self).enable_model_drag_source(start_button_mask,
+ target_entries,
+ actions)
- def enable_model_drag_dest(self, targets, actions):
- target_entries = _construct_target_list(targets)
- super(TreeView, self).enable_model_drag_dest(target_entries,
- actions)
+ if GTK2 or GTK3:
+ def enable_model_drag_dest(self, targets, actions):
+ target_entries = _construct_target_list(targets)
+ super(TreeView, self).enable_model_drag_dest(target_entries,
+ actions)
def scroll_to_cell(self, path, column=None, use_align=False, row_align=0.0, col_align=0.0):
if not isinstance(path, Gtk.TreePath):
async_free_list = g_slist_prepend (async_free_list, closure);
break;
default:
- g_error ("Invalid scope reached inside %s. Possibly a bad annotation?",
- g_base_info_get_name (closure->info));
+ /* Handle new scopes added by gobject-introspection */
+ g_critical ("Unknown scope reached inside %s. Please file an issue "
+ "at https://gitlab.gnome.org/GNOME/pygobject/issues/new",
+ g_base_info_get_name (closure->info));
}
_invoke_state_clear (&state);
project('pygobject', 'c',
- version : '3.42.0',
+ version : '3.42.1',
meson_version : '>= 0.47.0',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized'])
[tool.poetry]
name = "PyGObject"
-version = "3.42.0"
+version = "3.42.1"
description = "Python bindings for GObject Introspection"
authors = ["Christoph Reiter"]
from distutils.spawn import find_executable
-PYGOBJECT_VERSION = "3.42.0"
+PYGOBJECT_VERSION = "3.42.1"
GLIB_VERSION_REQUIRED = "2.56.0"
GI_VERSION_REQUIRED = "1.56.0"
PYCAIRO_VERSION_REQUIRED = "1.16.0"
# force untranslated messages, as we check for them in some tests
os.environ['LC_MESSAGES'] = 'C'
os.environ['G_DEBUG'] = 'fatal-warnings fatal-criticals'
- if sys.platform == "darwin":
- # gtk 3.22 has warnings and ciriticals on OS X, ignore for now
+ if sys.platform == "darwin" or os.name == "nt":
+ # gtk 3.22 has warnings and ciriticals on OS X, ignore for now.
+ # On Windows glib will create an error dialog which will block tests
+ # so it's never a good idea there to make things fatal.
os.environ['G_DEBUG'] = ''
# make Gio able to find our gschemas.compiled in tests/. This needs to be set
@unittest.skipUnless(Gtk, 'no Gtk')
def test_shared_array_length_with_prior_out_arg(self):
# Test the 'iter' out argument does not effect length argument skipping.
- self.assertEqual(Gtk.ListStore.insert_with_valuesv.__doc__,
- 'insert_with_valuesv(self, position:int, columns:list, values:list) -> iter:Gtk.TreeIter')
+ self.assertRegex(
+ Gtk.ListStore.insert_with_valuesv.__doc__,
+ 'insert_with_values.*\\(self, position:int, columns:list, values:list\\) -> iter:Gtk.TreeIter')
def test_sub_class_doc(self):
class A(GObject.Object):
self.assertGreaterEqual(micro, 0)
def test_timezone_constructor(self):
- timezone = GLib.TimeZone("+05:21")
- self.assertEqual(timezone.get_offset(0), ((5 * 60) + 21) * 60)
+ with warnings.catch_warnings():
+ warnings.simplefilter('ignore', DeprecationWarning)
+ timezone = GLib.TimeZone("+05:21")
+ self.assertEqual(timezone.get_offset(0), ((5 * 60) + 21) * 60)
def test_source_attach_implicit_context(self):
context = GLib.MainContext.default()
@unittest.skipIf(sys.platform == "darwin", "crashes")
@unittest.skipIf(GTK4, "uses lots of gtk3 only api")
- def test_drag_target_list_gtk3(self):
+ def test_tree_view_drag_target_list_gtk3(self):
mixed_target_list = [Gtk.TargetEntry.new('test0', 0, 0),
('test1', 1, 1),
Gtk.TargetEntry.new('test2', 2, 2),
treeview.enable_model_drag_dest(mixed_target_list,
Gdk.DragAction.DEFAULT | Gdk.DragAction.MOVE)
+ @unittest.skipUnless(GTK4, "gtk4 only")
+ def test_tree_view_drag_content_formats_gtk4(self):
+ content_formats = Gdk.ContentFormats.new(
+ ["application/json", "GTK_TREE_MODEL_ROW"]
+ )
+ treeview = Gtk.TreeView()
+ treeview.enable_model_drag_source(Gdk.ModifierType.BUTTON1_MASK,
+ content_formats,
+ Gdk.DragAction.MOVE)
+
+ treeview.enable_model_drag_dest(content_formats,
+ Gdk.DragAction.MOVE)
+
@unittest.skipIf(Gtk_version == "4.0", "not in gtk4")
def test_scrollbar(self):
adjustment = Gtk.Adjustment()
assert result.props.name == member
+@unittest.skipUnless(Gtk, 'Gtk not available')
+class TestListStore(unittest.TestCase):
+
+ def test_insert_with_values(self):
+ model = Gtk.ListStore(int)
+ assert hasattr(model, 'insert_with_values')
+ iter_ = model.insert_with_values(0, (0,), [42])
+ assert isinstance(iter_, Gtk.TreeIter)
+ assert hasattr(model, 'insert_with_valuesv')
+ iter_ = model.insert_with_valuesv(0, (0,), [43])
+ assert isinstance(iter_, Gtk.TreeIter)
+ assert len(model) == 2
+
+
@ignore_gi_deprecation_warnings
@unittest.skipUnless(Gtk, 'Gtk not available')
class TestTreeModel(unittest.TestCase):
projects / platform / upstream / python3-gobject.git / commitdiff