diff --git a/ChangeLog b/ChangeLog index 25b155467c..b9b1ddb60b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2005-09-01 Andy Wingo + + * examples/Makefile.am (examples_DATA): Dist fixer. + + * examples/debugslider.py: Renamed from debug-slider.py so it can + be imported. + + * examples/pipeline-tester: Add a debugslider. + + * pygst.py.in (require): If pygst.require() is called multiple + times, don't pollute sys.path with unneeded path entries. + 2005-08-31 Thomas Vander Stichele * gst/__init__.py: diff --git a/examples/Makefile.am b/examples/Makefile.am index 7ebbd3fcfd..6a221cbc86 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -2,7 +2,7 @@ examplesdir = $(pkgdatadir)/examples examples_DATA = \ bps.py \ cp.py \ - debug-slider.py \ + debugslider.py \ f2f.py \ filesrc.py \ gst123 \ diff --git a/examples/debug-slider.py b/examples/debugslider.py similarity index 100% rename from examples/debug-slider.py rename to examples/debugslider.py diff --git a/examples/pipeline-tester b/examples/pipeline-tester index 1ee3210277..afa10ca547 100755 --- a/examples/pipeline-tester +++ b/examples/pipeline-tester @@ -35,6 +35,9 @@ import pygst pygst.require('0.9') import gst +print sys.path +import debugslider + data = (('Video capture via V4L', 'v4lsrc name=source \n' @@ -147,6 +150,9 @@ class Window(gtk.Window): tv.set_headers_visible(False) tv.show() sw.add(tv) + ds = debugslider.DebugSlider() + ds.show() + b.pack_start(ds, False, False, 0) l = gtk.Label() l.set_selectable(True) l.show() diff --git a/pygst.py.in b/pygst.py.in index 439a7e8478..e3d6db989e 100644 --- a/pygst.py.in +++ b/pygst.py.in @@ -51,7 +51,9 @@ def require(version): assert version == _pygst_version, \ "Only version '%s' is available" % version - # prepend the pygst path ... + # move the pygst path to the front + while _pygst_dir in sys.path: + sys.path.remove(_pygst_dir) sys.path.insert(0, _pygst_dir) _pygst_required_version = version