From bdd7fe0d910a0bba8c44bda9c6ef699ffd4296e0 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Sat, 1 Apr 2006 20:00:33 +0000 Subject: make pygtk.require faster and more robust --- ChangeLog | 3 ++ Makefile.am | 8 +++++- pygtk.py | 84 ------------------------------------------------------ pygtk.py.in | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 85 deletions(-) delete mode 100644 pygtk.py create mode 100644 pygtk.py.in diff --git a/ChangeLog b/ChangeLog index cd0dc74..56c5931 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-04-01 Gustavo J. A. M. Carneiro + * pygtk.py.in (require): For version == '2.0', use a hardcoded + pygtk path, recorded during build. + * gobject/gobjectmodule.c (_pyg_strv_to_gvalue): Don't allow arbitrary sequences, only tuple or list, since a string is a sequence too. diff --git a/Makefile.am b/Makefile.am index f5ff9a3..732789f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,6 +11,7 @@ EXTRA_DIST = \ PKG-INFO \ PKG-INFO.in \ setup.py \ + pygtk.py.in \ dsextras.py INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -I$(top_srcdir)/gobject @@ -24,8 +25,13 @@ pkgpyexecdir = $(pyexecdir)/gtk-2.0 pkgpyexec_PYTHON = dsextras.py pkgpyexec_LTLIBRARIES = +pygtk.py: pygtk.py.in + sed -e s!\@pyexecdir\@!@pyexecdir@! \ + < $< > $@ +pygtk.py: Makefile + # python -pyexec_PYTHON = pygtk.py +nodist_pyexec_PYTHON = pygtk.py pyexec_LTLIBRARIES = noinst_PYTHON = ltihooks.py diff --git a/pygtk.py b/pygtk.py deleted file mode 100644 index 4ef6eec..0000000 --- a/pygtk.py +++ /dev/null @@ -1,84 +0,0 @@ -# -*- Mode: Python; py-indent-offset: 4 -*- -# pygtk - Python bindings for the GTK+ widget set. -# Copyright (C) 1998-2002 James Henstridge -# -# pygtk.py: pygtk version selection code. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA - -import fnmatch -import glob -import os -import sys - -__all__ = ['require'] - -_pygtk_dir_pat = 'gtk-[0-9].[0-9]' - -_pygtk_required_version = None - -def _get_available_versions(): - versions = {} - for dir in sys.path: - if not dir: - dir = os.getcwd() - - if not os.path.isdir(dir): - continue - - # if the dir is a pygtk dir, skip it - if fnmatch.fnmatchcase(os.path.basename(dir), _pygtk_dir_pat): - continue - - for filename in glob.glob(os.path.join(dir, _pygtk_dir_pat)): - pathname = os.path.join(dir, filename) - - # skip non directories - if not os.path.isdir(pathname): - continue - - # skip empty directories - if not os.listdir(pathname): - continue - - if not versions.has_key(filename[-3:]): - versions[filename[-3:]] = pathname - return versions - -def require(version): - global _pygtk_required_version - - if _pygtk_required_version != None: - assert _pygtk_required_version == version, \ - "a different version of gtk was already required" - return - - assert not sys.modules.has_key('gtk'), \ - "pygtk.require() must be called before importing gtk" - - versions = _get_available_versions() - assert versions.has_key(version), \ - "required version '%s' not found on system" % version - - # remove any pygtk dirs first ... - for dir in sys.path: - if fnmatch.fnmatchcase(os.path.basename(dir), _pygtk_dir_pat): - sys.path.remove(dir) - - # prepend the pygtk path ... - sys.path.insert(0, versions[version]) - - _pygtk_required_version = version diff --git a/pygtk.py.in b/pygtk.py.in new file mode 100644 index 0000000..c860c13 --- /dev/null +++ b/pygtk.py.in @@ -0,0 +1,94 @@ +# -*- Mode: Python; py-indent-offset: 4 -*- +# pygtk - Python bindings for the GTK+ widget set. +# Copyright (C) 1998-2002 James Henstridge +# +# pygtk.py: pygtk version selection code. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import fnmatch +import glob +import os +import os.path +import sys + +__all__ = ['require'] + +_pygtk_2_0_dir = os.path.normpath('@pyexecdir@/gtk-2.0') + +_pygtk_dir_pat = 'gtk-[0-9].[0-9]' + +_pygtk_required_version = None + +def _get_available_versions(): + versions = {} + for dir in sys.path: + if not dir: + dir = os.getcwd() + + if not os.path.isdir(dir): + continue + + # if the dir is a pygtk dir, skip it + if fnmatch.fnmatchcase(os.path.basename(dir), _pygtk_dir_pat): + continue + + for filename in glob.glob(os.path.join(dir, _pygtk_dir_pat)): + pathname = os.path.join(dir, filename) + + # skip non directories + if not os.path.isdir(pathname): + continue + + # skip empty directories + if not os.listdir(pathname): + continue + + if not versions.has_key(filename[-3:]): + versions[filename[-3:]] = pathname + return versions + +def require20(): + if _pygtk_2_0_dir not in sys.path: + sys.path.insert(0, _pygtk_2_0_dir) + +def require(version): + if version == '2.0': + return require20() + + global _pygtk_required_version + + if _pygtk_required_version != None: + assert _pygtk_required_version == version, \ + "a different version of gtk was already required" + return + + assert not sys.modules.has_key('gtk'), \ + "pygtk.require() must be called before importing gtk" + + versions = _get_available_versions() + assert versions.has_key(version), \ + "required version '%s' not found on system" % version + + # remove any pygtk dirs first ... + for dir in sys.path: + if fnmatch.fnmatchcase(os.path.basename(dir), _pygtk_dir_pat): + sys.path.remove(dir) + + # prepend the pygtk path ... + sys.path.insert(0, versions[version]) + + _pygtk_required_version = version -- cgit