examples/Makefile.am (examples_DATA): Dist fixer.

Original commit message from CVS:
2005-09-01  Andy Wingo  <wingo@pobox.com>

* 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.

diff --git a/ChangeLog b/ChangeLog
index 25b1554..b9b1ddb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-09-01  Andy Wingo  <wingo@pobox.com>
+
+       * 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  <thomas at apestaart dot org>
 
        * gst/__init__.py:

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 7ebbd3f..6a221cb 100644 (file)
--- 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 1ee3210..afa10ca 100755 (executable)
--- 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 439a7e8..e3d6db9 100644 (file)
--- 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