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

diff --git a/ChangeLog b/ChangeLog
index 090d6d4..d543d02 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 (file)
--- 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 (file)
--- 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 (file)
--- 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'