From 888ba79743d2d8957738f89ea97bd9d3d5b9468a Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Wed, 1 Jan 2003 22:24:49 +0000 Subject: Add default values. 2003-01-01 Johan Dahlin * gtk/gtk.defs (GtkTreeView.scroll_to_cell): Add default values. * gtk/gtk.override (_wrap_gtk_tree_selection_get_selected): Check the mode before calling gtk_tree_selection_get_selected, this avoids an abort() in gtk+. * pygtk.py: Updated to fix #102180, so .require() can be called twice and won't do anything the second time (eg, not raise an error) based upon patch by warner-gnome.bugzilla@lothar.com --- pygtk.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'pygtk.py') diff --git a/pygtk.py b/pygtk.py index 2310a0b..92abf36 100644 --- a/pygtk.py +++ b/pygtk.py @@ -24,8 +24,10 @@ import sys, os, re __all__ = ['require'] _pygtk_dir_pat = re.compile(r'^gtk-([\d]+[\d\.]+)$') +_pygtk_required_version = None def _get_available_versions(): + global _pygtk_dir_pat versions = {} for dir in sys.path: if not dir: dir = os.getcwd() @@ -42,9 +44,16 @@ def _get_available_versions(): return versions def require(version): + global _pygtk_required_version + assert not sys.modules.has_key('gtk'), \ "pygtk.require() must be called before importing gtk" + if _pygtk_required_version != None: + assert _pygtk_required_version == version, \ + "a different version of gtk was already required" + return + versions = _get_available_versions() assert versions.has_key(version), \ "required version '%s' not found on system" % version @@ -56,3 +65,5 @@ def require(version): # prepend the pygtk path ... sys.path.insert(0, versions[version]) + + _pygtk_required_version = version -- cgit