diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2008-06-13 11:11:38 +0000 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2008-06-13 11:11:38 +0000 |
| commit | 6c881f6ab6624f0f42b940ac6851f7efb08aa975 (patch) | |
| tree | ae48b2e1231f32e6557f8c00f519aa6ba82c0dfc | |
| parent | 7e06ad12c68b20ec5f4e409e5e0b2ef33afbc77e (diff) | |
Re-opens #530417
Original commit message from CVS:
* gst/__init__.py:
* gst/gstelement.override:
* testsuite/test_element.py:
Revert 2008-05-08 Edward Hervey <edward.hervey@collabora.co.uk>
Re-opens #530417
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gst/__init__.py | 8 | ||||
| -rw-r--r-- | gst/gstelement.override | 16 | ||||
| -rw-r--r-- | testsuite/test_element.py | 7 |
4 files changed, 8 insertions, 31 deletions
@@ -1,3 +1,11 @@ +2008-06-13 Edward Hervey <edward.hervey@collabora.co.uk> + + * gst/__init__.py: + * gst/gstelement.override: + * testsuite/test_element.py: + Revert 2008-05-08 Edward Hervey <edward.hervey@collabora.co.uk> + Re-opens #530417 + 2008-06-12 Edward Hervey <edward.hervey@collabora.co.uk> * gst/gstpad.override: diff --git a/gst/__init__.py b/gst/__init__.py index 3143797..3f41a21 100644 --- a/gst/__init__.py +++ b/gst/__init__.py @@ -174,14 +174,6 @@ if RTLD_GLOBAL != -1 and RTLD_LAZY != -1: except: pass -import gobject -from _gst import _install_element_meta - -_GstElementBaseMeta = getattr(gobject, 'GObjectMeta', type) -class _GstElementMeta(_GstElementBaseMeta): - __call__ = element_factory_make -_install_element_meta(_GstElementMeta) - version = get_gst_version sys.setdlopenflags(dlsave) diff --git a/gst/gstelement.override b/gst/gstelement.override index 0c86732..7cc0d03 100644 --- a/gst/gstelement.override +++ b/gst/gstelement.override @@ -26,22 +26,6 @@ ignore gst_element_get_property gst_element_set_property %% -define _install_element_meta -static PyObject * -_wrap__install_element_meta(PyObject *self, PyObject *args) -{ - PyObject *metaclass; - - if (!PyArg_ParseTuple(args, "O", &metaclass)) - return NULL; - - Py_INCREF(metaclass); - PyGstElement_Type.ob_type = (PyTypeObject*)metaclass; - - Py_INCREF(Py_None); - return Py_None; -} -%% override gst_element_get_pad_template args static PyObject * _wrap_gst_element_get_pad_template(PyGObject *self, PyObject *args) diff --git a/testsuite/test_element.py b/testsuite/test_element.py index e354ec8..3c84e1a 100644 --- a/testsuite/test_element.py +++ b/testsuite/test_element.py @@ -40,12 +40,6 @@ class ElementTest(TestCase): assert isinstance(element, gst.Element) assert element.get_name() == self.alias - def testFancyConstructor(self): - element = gst.Element(self.name, self.alias) - self.failUnless(element, 'element is None') - self.failUnless(isinstance(element, gst.Element)) - self.assertEquals(element.get_name(), self.alias) - ## FIXME : Make a new test for state changes, using bus signals ## class FakeSinkTest(ElementTest): @@ -153,7 +147,6 @@ class NonExistentTest(ElementTest): testGoodConstructor = lambda s: None testGoodConstructor2 = lambda s: None - testFancyConstructor = lambda s: None class FileSrcTest(ElementTest): name = 'filesrc' |